sdk/Build System: Improved the bootstrap Makefiles

[sdk] / ecere / Makefile

diff --git a/ecere/Makefile b/ecere/Makefile
index 4902a34..b59721b 100755 (executable)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -30,20 +30,10 @@ CONSOLE = -mwindows
 # INCLUDES
 
 _CF_DIR = ../
+USE_BOOTSTRAP := defined
 
 include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)include.mk
-
-# CUSTOM TOOLCHAIN / COMPILER CONFIG
-
-export LD_LIBRARY_PATH=../obj/$(PLATFORM)/lib
-export DYLD_LIBRARY_PATH=../obj/$(PLATFORM)/lib
-ECP := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp$(E))
-ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))
-ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))
-EAR := $(call psep,../obj/$(PLATFORM)/bin/ear)
-
-# END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
+include $(_CF_DIR)default.cf
 
 # POST-INCLUDES VARIABLES
 
@@ -403,23 +393,24 @@ CFLAGS += \
                         -I../deps/freetype-2.3.12/include \
                         -I../deps/jpeg-6b \
                         -I../deps/libpng-1.4.0 \
+                        -I../deps/libungif-4.1.1/lib \
                         -I../deps/zlib \
-                        -I/usr/X11R6/include \
-                        -I/usr/X11R6/include/freetype2,) \
+                        -I../deps/freetype-2.3.12/include,) \
         $(if $(LINUX_TARGET), \
                         -I/usr/include/freetype2 \
-                        -I/usr/X11R6/include \
-                        -I/usr/X11R6/include/freetype2,) \
+                        -I../deps/libungif-4.1.1/lib,) \
         $(if $(OSX_TARGET), \
-                        -I../deps/jpeg-6b \
-                        -I../deps/libpng-1.4.0 \
                         -I/usr/include/freetype2 \
+                        -I/usr/X11R6/include/freetype2 \
                         -I/usr/X11R6/include \
-                        -I/usr/X11R6/include/freetype2,) \
+                        -I../deps/jpeg-6b \
+                        -I../deps/libpng-1.4.0 \
+                        -I../deps/libungif-4.1.1/lib,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w \
                         -DBUILDING_ECERE_COM \
-                        -I../deps/libungif-4.1.1/lib \
-                        -Isrc/gfx/drivers/harfbuzz
+                        -Isrc/gfx/drivers/harfbuzz \
+                        -I/usr/X11R6/include \
+                        -I/usr/X11R6/include/freetype2
 
 CUSTOM1_CFLAGS = \
                         -DECERE_COM_MODULE \
@@ -507,7 +498,7 @@ endif
 
 
 
-CECFLAGS += "-cpp $(CPP)"
+CECFLAGS += -cpp $(_CPP)
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT)