Merge branch 'master' into SimpleDMR

This commit is contained in:
Jonathan Naylor
2020-09-22 15:55:13 +01:00

View File

@@ -1,9 +1,9 @@
# This makefile is for use with the Raspberry Pi when using an OLED display. The wiringpi library is needed. # This makefile is for use with the Raspberry Pi when using an OLED display. The wiringpi library is not needed.
CC = cc CC = cc
CXX = c++ CXX = c++
CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DOLED -I/usr/local/include CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DOLED -I/usr/local/include
LIBS = -lArduiPi_OLED -lwiringPi -lpthread LIBS = -lArduiPi_OLED -lpthread
LDFLAGS = -g -L/usr/local/lib LDFLAGS = -g -L/usr/local/lib
OBJECTS = \ OBJECTS = \