buildsystem,epj2make,ide; new per-file-config-platform CFLAGS generation method....

[sdk] / epj2make / Makefile

diff --git a/epj2make/Makefile b/epj2make/Makefile
old mode 100644 (file)
new mode 100755 (executable)
index c4abc94..8c0e3c7
--- a/epj2make/Makefile
+++ b/epj2make/Makefile
@@ -22,6 +22,7 @@ OBJECTS = \
        $(OBJ)IDESettings.o \
        $(OBJ)OldIDESettings.o \
        $(OBJ)StringsBox.o \
+       $(OBJ)DynamicString.o \
        $(OBJ)epj2make.o \
        $(OBJ)$(MODULE).main$(O)
 
@@ -32,6 +33,7 @@ COBJECTS = \
        $(OBJ)IDESettings.c \
        $(OBJ)OldIDESettings.c \
        $(OBJ)StringsBox.c \
+       $(OBJ)DynamicString.c \
        $(OBJ)epj2make.c
 
 SYMBOLS = \
@@ -41,6 +43,7 @@ SYMBOLS = \
        $(OBJ)IDESettings.sym \
        $(OBJ)OldIDESettings.sym \
        $(OBJ)StringsBox.sym \
+       $(OBJ)DynamicString.sym \
        $(OBJ)epj2make.sym
 
 IMPORTS = \
@@ -50,6 +53,7 @@ IMPORTS = \
        $(OBJ)IDESettings.imp \
        $(OBJ)OldIDESettings.imp \
        $(OBJ)StringsBox.imp \
+       $(OBJ)DynamicString.imp \
        $(OBJ)epj2make.imp
 
 SOURCES = \
@@ -59,12 +63,21 @@ SOURCES = \
        ../ide/src/IDESettings.ec \
        ../ide/src/OldIDESettings.ec \
        ../extras/gui/controls/StringsBox.ec \
+       ../extras/types/DynamicString.ec \
        epj2make.ec
 
-RESOURCES = ../include.mk
+RESOURCES = \
+       locale/zh_CN/LC_MESSAGES/epj2make.mo \
+       ../crossplatform.mk
+
+ifndef DEBIAN_PACKAGE
+CFLAGS =
+endif
+OFLAGS =
 
 # CROSS-PLATFORM MAGIC
 
+include ../crossplatform.mk
 include ../include.mk
 
 # TOOLCHAIN
@@ -77,14 +90,14 @@ EAR := $(call psep,../obj/$(PLATFORM)/bin/ear)
 
 # FLAGS
 
-CFLAGS = -fmessage-length=0 -O2 -ffast-math -m32 $(FPIC) -w \
+CFLAGS += -fmessage-length=0 -O2 -ffast-math $(FORCE_32_BIT) $(FPIC) -w \
         -DMAKEFILE_GENERATOR
 
 CECFLAGS =
 
 ECFLAGS = -nolinenumbers
 
-OFLAGS = -m32 \
+OFLAGS += $(FORCE_32_BIT) \
         -L../obj/$(PLATFORM)/bin \
         -L../obj/$(PLATFORM)/lib
 
@@ -93,13 +106,13 @@ LIBS = -lecere $(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 LINUX
+ifdef LINUX_TARGET
 
 endif
 
@@ -121,8 +134,12 @@ $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
-       $(EAR) awq $(TARGET) ../include.mk ""
+endif
+       $(EAR) awq $(TARGET) ../crossplatform.mk ""
+       $(EAR) awq $(TARGET) locale/zh_CN/LC_MESSAGES/epj2make.mo "locale/zh_CN/LC_MESSAGES"
+       $(EAR) awq $(TARGET) locale/es_ES/LC_MESSAGES/epj2make.mo "locale/es_ES/LC_MESSAGES"
        $(call cpq,$(TARGET),../obj/$(PLATFORM)/bin/)
 
 # SYMBOL RULES
@@ -145,6 +162,9 @@ $(OBJ)OldIDESettings.sym: ../ide/src/OldIDESettings.ec
 $(OBJ)StringsBox.sym: ../extras/gui/controls/StringsBox.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c ../extras/gui/controls/StringsBox.ec -o $(OBJ)StringsBox.sym
 
+$(OBJ)DynamicString.sym: ../extras/types/DynamicString.ec
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c ../extras/types/DynamicString.ec -o $(OBJ)DynamicString.sym
+
 $(OBJ)epj2make.sym: epj2make.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c epj2make.ec -o $(OBJ)epj2make.sym
 
@@ -168,6 +188,9 @@ $(OBJ)OldIDESettings.c: ../ide/src/OldIDESettings.ec $(OBJ)OldIDESettings.sym |
 $(OBJ)StringsBox.c: ../extras/gui/controls/StringsBox.ec $(OBJ)StringsBox.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c ../extras/gui/controls/StringsBox.ec -o $(OBJ)StringsBox.c -symbols $(OBJ)
 
+$(OBJ)DynamicString.c: ../extras/types/DynamicString.ec $(OBJ)DynamicString.sym | $(SYMBOLS)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c ../extras/types/DynamicString.ec -o $(OBJ)DynamicString.c -symbols $(OBJ)
+
 $(OBJ)epj2make.c: epj2make.ec $(OBJ)epj2make.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c epj2make.ec -o $(OBJ)epj2make.c -symbols $(OBJ)
 
@@ -191,6 +214,9 @@ $(OBJ)OldIDESettings.o: $(OBJ)OldIDESettings.c
 $(OBJ)StringsBox.o: $(OBJ)StringsBox.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)StringsBox.c -o $(OBJ)StringsBox.o
 
+$(OBJ)DynamicString.o: $(OBJ)DynamicString.c
+       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)DynamicString.c -o $(OBJ)DynamicString.o
+
 $(OBJ)epj2make.o: $(OBJ)epj2make.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)epj2make.c -o $(OBJ)epj2make.o