ide/Makefiles: Updated tarball makefiles to use FORCE_32BIT; Disabled forcing -m32...

[sdk] / compiler / bootstrap / ecp / Makefile

diff --git a/compiler/bootstrap/ecp/Makefile b/compiler/bootstrap/ecp/Makefile
index f03e620..f33719f 100644 (file)
--- a/compiler/bootstrap/ecp/Makefile
+++ b/compiler/bootstrap/ecp/Makefile
@@ -15,24 +15,34 @@ CONSOLE =
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/ecp$(E)
 
-OBJECTS = $(OBJ)ecp.o $(OBJ)$(MODULE).main$(O)
+OBJECTS = \
+       $(OBJ)ecp.o \
+       $(OBJ)$(MODULE).main$(O)
 
-SOURCES = bootstrap/ecp.c bootstrap/ecp.main.c
+SOURCES = \
+       bootstrap/ecp.c \
+       bootstrap/ecp.main.c
+
+ifndef DEBIAN_PACKAGE
+CFLAGS =
+endif
+OFLAGS =
 
 # CROSS-PLATFORM MAGIC
 
+include ../../../crossplatform.mk
 include ../../../include.mk
 
 # FLAGS
 
-CFLAGS = -fmessage-length=0 -O2 -ffast-math -m32 $(FPIC) -w \
+CFLAGS += -fmessage-length=0 -O2 -ffast-math $(FORCE_32_BIT) $(FPIC) -w \
         -DECERE_STATIC
 
 CECFLAGS =
 
 ECFLAGS = -nolinenumbers
 
-OFLAGS = -m32 \
+OFLAGS += $(FORCE_32_BIT) \
         -L../ecere/obj/bootstrap.$(PLATFORM) \
         -L../libec/obj/bootstrap.$(PLATFORM)
 
@@ -41,23 +51,21 @@ LIBS = -lecereBootstrap -lecBootstrap $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 UPXFLAGS = -9 -q
 
 # HARD CODED PLATFORM-SPECIFIC OPTIONS
-ifdef LINUX
+ifdef LINUX_TARGET
 OFLAGS += -Wl,--no-undefined
 endif
 
 # PLATFORM-SPECIFIC OPTIONS
 
-ifdef WINDOWS
-
-LIBS += -Wl,--enable-stdcall-fixup
+ifdef WINDOWS_TARGET
 
 else
-ifdef LINUX
+ifdef LINUX_TARGET
 
 LIBS += -lm -ldl
 
 else
-ifdef OSX
+ifdef OSX_TARGET
 
 LIBS += -lm -ldl
 
@@ -73,7 +81,9 @@ objdir:
 
 $(TARGET): $(SOURCES) $(RESOURCES) | objdir $(SYMBOLS) $(OBJECTS)
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
+endif
 
 $(OBJ)ecp.o: bootstrap/ecp.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c bootstrap/ecp.c -o $(OBJ)ecp.o