Merge branch 'master' into nxdn

This commit is contained in:
Jonathan Naylor
2018-01-29 21:43:03 +00:00

View File

@@ -3,7 +3,7 @@
CC = gcc CC = gcc
CXX = g++ CXX = g++
CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DOLED -I/usr/local/include CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DOLED -I/usr/local/include
LIBS = -lArduiPi_OLED -lpthread LIBS = -lArduiPi_OLED -li2c -lpthread
LDFLAGS = -g -L/usr/local/lib LDFLAGS = -g -L/usr/local/lib
OBJECTS = \ OBJECTS = \