diff --git a/eg/light/makefile b/eg/light/makefile index 8c1a96a..4d1d914 100644 --- a/eg/light/makefile +++ b/eg/light/makefile @@ -11,27 +11,20 @@ BIN = light # -- creating MAP file MAP = 0 -ifeq ($(OS),Windows_NT) # -- platform (core) -# ARM Cortex-M3: __MDKARM__ -# DOS: __DJGPP__ -# WIN32: __MINGW__ -# UNIX: __UNIX__ +ifeq ($(OS),Windows_NT) +# WIN32 PLATFORM = __MINGW__ else +# UNIX PLATFORM = __UNIX__ endif TOP = ../.. # -- compilers -ifeq ($(PLATFORM),__DJGPP__) -CC = $(DJGPP_HOME)/bin/gcc.exe -CXX = $(DJGPP_HOME)/bin/gxx.exe -else CC = gcc CXX = g++ -endif # -- on EV3 BRICK ifeq ($(PLATFORM),__UNIX__) @@ -57,18 +50,12 @@ PP = @echo makefile: warning: preprocessing step is skipped, endif # -- output subdirectory -ifeq ($(PLATFORM),__DJGPP__) -D_PLATFORM = djgpp -else - ifeq ($(PLATFORM),__MINGW__) D_PLATFORM = mingw else D_PLATFORM = endif -endif - # -- yupp import directories D_YU = $(TOP)/source/ev3 @@ -148,12 +135,6 @@ CFLAGS = $(addprefix -I, $(D_H)) -O2 -W -Wall -Wno-comment -std=gnu99 CXXFLAGS = $(addprefix -I, $(D_H)) -O2 -ffast-math -funroll-loops -fno-exceptions -fomit-frame-pointer -g -W -Wall -Wno-comment ASMFLAGS = -Wall -# -- platform specific options -ifeq ($(PLATFORM),__DJGPP__) -BUFSIZE = 16k -MINSTACK = 1024k -endif - # --------------------------------- # files lists # --------------------------------- @@ -196,14 +177,8 @@ endef endif # -- optional final tools -ifeq ($(PLATFORM),__DJGPP__) define final - stubedit $1 minstack=$(MINSTACK) bufsize=$(BUFSIZE) endef -else -define final -endef -endif # -- removal list R = $(F_BIN) $(O) diff --git a/eg/sensor/makefile b/eg/sensor/makefile index ae29e3c..d608351 100644 --- a/eg/sensor/makefile +++ b/eg/sensor/makefile @@ -11,27 +11,20 @@ BIN = sensor # -- creating MAP file MAP = 0 -ifeq ($(OS),Windows_NT) # -- platform (core) -# ARM Cortex-M3: __MDKARM__ -# DOS: __DJGPP__ -# WIN32: __MINGW__ -# UNIX: __UNIX__ +ifeq ($(OS),Windows_NT) +# WIN32 PLATFORM = __MINGW__ else +# UNIX PLATFORM = __UNIX__ endif TOP = ../.. # -- compilers -ifeq ($(PLATFORM),__DJGPP__) -CC = $(DJGPP_HOME)/bin/gcc.exe -CXX = $(DJGPP_HOME)/bin/gxx.exe -else CC = gcc CXX = g++ -endif # -- on EV3 BRICK ifeq ($(PLATFORM),__UNIX__) @@ -57,18 +50,12 @@ PP = @echo makefile: warning: preprocessing step is skipped, endif # -- output subdirectory -ifeq ($(PLATFORM),__DJGPP__) -D_PLATFORM = djgpp -else - ifeq ($(PLATFORM),__MINGW__) D_PLATFORM = mingw else D_PLATFORM = endif -endif - # -- yupp import directories D_YU = $(TOP)/source/ev3 @@ -148,12 +135,6 @@ CFLAGS = $(addprefix -I, $(D_H)) -O2 -W -Wall -Wno-comment -std=gnu99 CXXFLAGS = $(addprefix -I, $(D_H)) -O2 -ffast-math -funroll-loops -fno-exceptions -fomit-frame-pointer -g -W -Wall -Wno-comment ASMFLAGS = -Wall -# -- platform specific options -ifeq ($(PLATFORM),__DJGPP__) -BUFSIZE = 16k -MINSTACK = 1024k -endif - # --------------------------------- # files lists # --------------------------------- @@ -196,14 +177,8 @@ endef endif # -- optional final tools -ifeq ($(PLATFORM),__DJGPP__) define final - stubedit $1 minstack=$(MINSTACK) bufsize=$(BUFSIZE) endef -else -define final -endef -endif # -- removal list R = $(F_BIN) $(O) diff --git a/eg/tacho/makefile b/eg/tacho/makefile index 371b40c..0264b10 100644 --- a/eg/tacho/makefile +++ b/eg/tacho/makefile @@ -11,27 +11,20 @@ BIN = tacho # -- creating MAP file MAP = 0 -ifeq ($(OS),Windows_NT) # -- platform (core) -# ARM Cortex-M3: __MDKARM__ -# DOS: __DJGPP__ -# WIN32: __MINGW__ -# UNIX: __UNIX__ +ifeq ($(OS),Windows_NT) +# WIN32 PLATFORM = __MINGW__ else +# UNIX PLATFORM = __UNIX__ endif TOP = ../.. # -- compilers -ifeq ($(PLATFORM),__DJGPP__) -CC = $(DJGPP_HOME)/bin/gcc.exe -CXX = $(DJGPP_HOME)/bin/gxx.exe -else CC = gcc CXX = g++ -endif # -- on EV3 BRICK ifeq ($(PLATFORM),__UNIX__) @@ -57,18 +50,12 @@ PP = @echo makefile: warning: preprocessing step is skipped, endif # -- output subdirectory -ifeq ($(PLATFORM),__DJGPP__) -D_PLATFORM = djgpp -else - ifeq ($(PLATFORM),__MINGW__) D_PLATFORM = mingw else D_PLATFORM = endif -endif - # -- yupp import directories D_YU = $(TOP)/source/ev3 @@ -148,12 +135,6 @@ CFLAGS = $(addprefix -I, $(D_H)) -O2 -W -Wall -Wno-comment -std=gnu99 CXXFLAGS = $(addprefix -I, $(D_H)) -O2 -ffast-math -funroll-loops -fno-exceptions -fomit-frame-pointer -g -W -Wall -Wno-comment ASMFLAGS = -Wall -# -- platform specific options -ifeq ($(PLATFORM),__DJGPP__) -BUFSIZE = 16k -MINSTACK = 1024k -endif - # --------------------------------- # files lists # --------------------------------- @@ -166,6 +147,7 @@ S_YUCXX = $(wildcard $(addsuffix /*$(E_YUCXX), $(D_CXX))) G_CXX = $(addsuffix $(E_CXX), $(basename $(S_YUCXX))) G_C = $(addsuffix $(E_C), $(basename $(S_YUC))) G_H = $(addsuffix $(E_H), $(basename $(S_YUH))) + S_C = $(sort $(wildcard $(addsuffix /*$(E_C), $(D_C))) $(G_C)) S_CXX = $(sort $(wildcard $(addsuffix /*$(E_CXX), $(D_CXX))) $(G_CXX)) S_ASM = $(wildcard $(addsuffix /*$(E_ASM), $(D_ASM))) @@ -195,14 +177,8 @@ endef endif # -- optional final tools -ifeq ($(PLATFORM),__DJGPP__) define final - stubedit $1 minstack=$(MINSTACK) bufsize=$(BUFSIZE) endef -else -define final -endef -endif # -- removal list R = $(F_BIN) $(O) diff --git a/lib/mingw/libev3dev-c.a b/lib/mingw/libev3dev-c.a index 8cc17a1..d9df0a8 100644 Binary files a/lib/mingw/libev3dev-c.a and b/lib/mingw/libev3dev-c.a differ diff --git a/lib/mingw/libev3dev.a b/lib/mingw/libev3dev.a deleted file mode 100644 index 1888073..0000000 Binary files a/lib/mingw/libev3dev.a and /dev/null differ diff --git a/source/ev3/makefile b/source/ev3/makefile index 8df5c68..90e31b2 100644 --- a/source/ev3/makefile +++ b/source/ev3/makefile @@ -8,29 +8,21 @@ # -- binary name (without prefix and extension) BIN = ev3dev-c -ifeq ($(OS),Windows_NT) # -- platform (core) -# ARM Cortex-M3: __MDKARM__ -# DOS: __DJGPP__ -# WIN32: __MINGW__ -# UNIX: __UNIX__ +ifeq ($(OS),Windows_NT) +# WIN32 PLATFORM = __MINGW__ else +# UNIX PLATFORM = __UNIX__ endif TOP = ../.. # -- compilers -ifeq ($(PLATFORM),__DJGPP__) -CC = $(DJGPP_HOME)/bin/gcc.exe -CXX = $(DJGPP_HOME)/bin/gxx.exe -AR = $(DJGPP_HOME)/bin/ar.exe -else CC = gcc CXX = g++ AR = ar -endif # -- on EV3 BRICK ifeq ($(PLATFORM),__UNIX__) @@ -56,31 +48,19 @@ PP = @echo makefile: warning: preprocessing step is skipped, endif # -- output subdirectory -ifeq ($(PLATFORM),__DJGPP__) -D_PLATFORM = djgpp -else - ifeq ($(PLATFORM),__MINGW__) D_PLATFORM = mingw else D_PLATFORM = endif -endif - # -- install directory -ifeq ($(PLATFORM),__DJGPP__) -D_INSTALL = $(DJGPP_HOME) -else - ifeq ($(PLATFORM),__MINGW__) D_INSTALL = $(MINGW_HOME) else D_INSTALL = /usr/local endif -endif - # -- yupp import directories D_YU = $(TOP)/source/ev3 @@ -152,12 +132,6 @@ endif ASMFLAGS = -Wall -# -- platform specific options -ifeq ($(PLATFORM),__DJGPP__) -BUFSIZE = 16k -MINSTACK = 1024k -endif - # --------------------------------- # files lists # --------------------------------- @@ -200,14 +174,8 @@ endef endif # -- optional final tools -ifeq ($(PLATFORM),__DJGPP__) define final - stubedit $1 minstack=$(MINSTACK) bufsize=$(BUFSIZE) endef -else -define final -endef -endif # -- removal list R = $(F_BIN) $(O)