sdk/Build System: Took out extra inclusion of LDFLAGS; Moved $(CPPFLAGS) and -D_DEBUG...

[sdk] / ear / extract / Makefile

diff --git a/ear/extract/Makefile b/ear/extract/Makefile
index 5159e58..e13131b 100755 (executable)
--- a/ear/extract/Makefile
+++ b/ear/extract/Makefile
@@ -15,37 +15,25 @@ TARGET_TYPE = executable
 ECFLAGS =
 ifndef DEBIAN_PACKAGE
 CFLAGS =
+LDFLAGS =
 endif
 CECFLAGS =
 OFLAGS =
-LDFLAGS =
 LIBS =
 
 ifdef DEBUG
 NOSTRIP := y
 endif
 
-ifdef EXECUTABLE_TARGET
 CONSOLE = -mwindows
-endif
 
 # 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)
-ECC := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc)
-ECS := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs)
-EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear)
-
-# END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
+include $(_CF_DIR)default.cf
 
 # POST-INCLUDES VARIABLES
 
@@ -132,7 +120,8 @@ ifndef STATIC_LIBRARY_TARGET
 LIBS += \
        $(call _L,mpr) \
        $(call _L,winmm) \
-       $(call _L,imm32)
+       $(call _L,imm32) \
+       $(call _L,gdi32)
 endif
 
 else
@@ -177,13 +166,12 @@ endif
 
 
 
-CECFLAGS += -cpp $(call escspace,$(CPP))
+CECFLAGS += -cpp $(_CPP)
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \
         -L../../ecere/obj/vanilla.$(PLATFORM) \
         -L../../deps/zlib/obj/release.$(PLATFORM)
-OFLAGS += $(LDFLAGS)
 endif
 
 # TARGETS