#define of GUI forgotten in Makefile and Companion

This commit is contained in:
bsongis
2015-01-22 07:19:27 +01:00
parent bf0f4cae13
commit c615a35e14
7 changed files with 7 additions and 0 deletions
@@ -22,6 +22,7 @@
#define SIMU_EXCEPTIONS #define SIMU_EXCEPTIONS
#define PCBGRUVIN9X #define PCBGRUVIN9X
#define CPUM2560 #define CPUM2560
#define GUI
#define ROTARY_ENCODERS 2 #define ROTARY_ENCODERS 2
#define HELI #define HELI
#define TEMPLATES #define TEMPLATES
@@ -22,6 +22,7 @@
#define SIMU_EXCEPTIONS #define SIMU_EXCEPTIONS
#define PCBSTD #define PCBSTD
#define CPUM128 #define CPUM128
#define GUI
#define HELI #define HELI
#define TEMPLATES #define TEMPLATES
#define SPLASH #define SPLASH
@@ -23,6 +23,7 @@
#define SIMU_EXCEPTIONS #define SIMU_EXCEPTIONS
#define PCBSTD #define PCBSTD
#define CPUM64 #define CPUM64
#define GUI
#define SPLASH #define SPLASH
#define FLIGHT_MODES #define FLIGHT_MODES
#define PPM_UNIT_PERCENT_PREC1 #define PPM_UNIT_PERCENT_PREC1
@@ -22,6 +22,7 @@
#define SIMU_EXCEPTIONS #define SIMU_EXCEPTIONS
#define PCBSKY9X #define PCBSKY9X
#define CPUARM #define CPUARM
#define GUI
#define REVB #define REVB
#define ROTARY_ENCODERS 1 #define ROTARY_ENCODERS 1
#define HELI #define HELI
@@ -22,6 +22,7 @@
#define SIMU_EXCEPTIONS #define SIMU_EXCEPTIONS
#define PCBTARANIS #define PCBTARANIS
#define CPUARM #define CPUARM
#define GUI
#define HELI #define HELI
#define SPLASH #define SPLASH
#define FLIGHT_MODES #define FLIGHT_MODES
@@ -22,6 +22,7 @@
#define SIMU_EXCEPTIONS #define SIMU_EXCEPTIONS
#define PCBTARANIS #define PCBTARANIS
#define CPUARM #define CPUARM
#define GUI
#define HELI #define HELI
#define SPLASH #define SPLASH
#define FLIGHT_MODES #define FLIGHT_MODES
+1
View File
@@ -951,6 +951,7 @@ endif
ifeq ($(GUI), YES) ifeq ($(GUI), YES)
GUISRC = gui/$(GUIDIRECTORY)/helpers.cpp gui/$(GUIDIRECTORY)/navigation.cpp gui/$(GUIDIRECTORY)/popups.cpp gui/$(GUIDIRECTORY)/widgets.cpp gui/$(GUIDIRECTORY)/menus.cpp $(GUIMODELSRC) $(GUIGENERALSRC) gui/$(GUIDIRECTORY)/view_main.cpp gui/$(GUIDIRECTORY)/view_statistics.cpp GUISRC = gui/$(GUIDIRECTORY)/helpers.cpp gui/$(GUIDIRECTORY)/navigation.cpp gui/$(GUIDIRECTORY)/popups.cpp gui/$(GUIDIRECTORY)/widgets.cpp gui/$(GUIDIRECTORY)/menus.cpp $(GUIMODELSRC) $(GUIGENERALSRC) gui/$(GUIDIRECTORY)/view_main.cpp gui/$(GUIDIRECTORY)/view_statistics.cpp
CPPDEFS += -DGUI
endif endif
CPPSRC += opentx.cpp functions.cpp strhelpers.cpp $(PULSESSRC) switches.cpp curves.cpp mixer.cpp stamp.cpp $(GUISRC) $(EEPROMSRC) CPPSRC += opentx.cpp functions.cpp strhelpers.cpp $(PULSESSRC) switches.cpp curves.cpp mixer.cpp stamp.cpp $(GUISRC) $(EEPROMSRC)