Ecere Software / sdk / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 48d3363..8c0e3c7
--- a/epj2make/Makefile
+++ b/epj2make/Makefile
@@ -15,30 +15,69 @@ CONSOLE = -mconsole
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/epj2make$(E)
 
-OBJECTS = $(OBJ)Project.o $(OBJ)ProjectConfig.o $(OBJ)ProjectNode.o $(OBJ)IDESettings.o \
-       $(OBJ)OldIDESettings.o $(OBJ)PathBox.o $(OBJ)StringsBox.o $(OBJ)DirectoriesBox.o $(OBJ)epj2make.o \
+OBJECTS = \
+       $(OBJ)Project.o \
+       $(OBJ)ProjectConfig.o \
+       $(OBJ)ProjectNode.o \
+       $(OBJ)IDESettings.o \
+       $(OBJ)OldIDESettings.o \
+       $(OBJ)StringsBox.o \
+       $(OBJ)DynamicString.o \
+       $(OBJ)epj2make.o \
        $(OBJ)$(MODULE).main$(O)
 
-COBJECTS = $(OBJ)Project.c $(OBJ)ProjectConfig.c $(OBJ)ProjectNode.c $(OBJ)IDESettings.c \
-       $(OBJ)OldIDESettings.c $(OBJ)PathBox.c $(OBJ)StringsBox.c $(OBJ)DirectoriesBox.c $(OBJ)epj2make.c
-
-SYMBOLS = $(OBJ)Project.sym $(OBJ)ProjectConfig.sym $(OBJ)ProjectNode.sym \
-       $(OBJ)IDESettings.sym $(OBJ)OldIDESettings.sym $(OBJ)PathBox.sym $(OBJ)StringsBox.sym \
-       $(OBJ)DirectoriesBox.sym $(OBJ)epj2make.sym
-
-IMPORTS = $(OBJ)Project.imp $(OBJ)ProjectConfig.imp $(OBJ)ProjectNode.imp \
-       $(OBJ)IDESettings.imp $(OBJ)OldIDESettings.imp $(OBJ)PathBox.imp $(OBJ)StringsBox.imp \
-       $(OBJ)DirectoriesBox.imp $(OBJ)epj2make.imp
-
-SOURCES = ../ide/src/project/Project.ec ../ide/src/project/ProjectConfig.ec \
-       ../ide/src/project/ProjectNode.ec ../ide/src/IDESettings.ec ../ide/src/OldIDESettings.ec \
-       ../extras/gui/controls/PathBox.ec ../extras/gui/controls/StringsBox.ec \
-       ../extras/gui/controls/DirectoriesBox.ec epj2make.ec
-
-RESOURCES = ../include.mk
+COBJECTS = \
+       $(OBJ)Project.c \
+       $(OBJ)ProjectConfig.c \
+       $(OBJ)ProjectNode.c \
+       $(OBJ)IDESettings.c \
+       $(OBJ)OldIDESettings.c \
+       $(OBJ)StringsBox.c \
+       $(OBJ)DynamicString.c \
+       $(OBJ)epj2make.c
+
+SYMBOLS = \
+       $(OBJ)Project.sym \
+       $(OBJ)ProjectConfig.sym \
+       $(OBJ)ProjectNode.sym \
+       $(OBJ)IDESettings.sym \
+       $(OBJ)OldIDESettings.sym \
+       $(OBJ)StringsBox.sym \
+       $(OBJ)DynamicString.sym \
+       $(OBJ)epj2make.sym
+
+IMPORTS = \
+       $(OBJ)Project.imp \
+       $(OBJ)ProjectConfig.imp \
+       $(OBJ)ProjectNode.imp \
+       $(OBJ)IDESettings.imp \
+       $(OBJ)OldIDESettings.imp \
+       $(OBJ)StringsBox.imp \
+       $(OBJ)DynamicString.imp \
+       $(OBJ)epj2make.imp
+
+SOURCES = \
+       ../ide/src/project/Project.ec \
+       ../ide/src/project/ProjectConfig.ec \
+       ../ide/src/project/ProjectNode.ec \
+       ../ide/src/IDESettings.ec \
+       ../ide/src/OldIDESettings.ec \
+       ../extras/gui/controls/StringsBox.ec \
+       ../extras/types/DynamicString.ec \
+       epj2make.ec
+
+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
@@ -51,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
 
@@ -67,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
 
@@ -91,10 +130,16 @@ $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c $(OBJ)$(MODULE).main.ec -o $(OBJ)$(MODULE).main.sym -symbols $(OBJ)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.ec -o $(OBJ)$(MODULE).main.c -symbols $(OBJ)
 
-$(TARGET): $(SOURCES) $(RESOURCES) | objdir $(SYMBOLS) $(OBJECTS)
+$(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
@@ -114,14 +159,11 @@ $(OBJ)IDESettings.sym: ../ide/src/IDESettings.ec
 $(OBJ)OldIDESettings.sym: ../ide/src/OldIDESettings.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c ../ide/src/OldIDESettings.ec -o $(OBJ)OldIDESettings.sym
 
-$(OBJ)PathBox.sym: ../extras/gui/controls/PathBox.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c ../extras/gui/controls/PathBox.ec -o $(OBJ)PathBox.sym
-
 $(OBJ)StringsBox.sym: ../extras/gui/controls/StringsBox.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c ../extras/gui/controls/StringsBox.ec -o $(OBJ)StringsBox.sym
 
-$(OBJ)DirectoriesBox.sym: ../extras/gui/controls/DirectoriesBox.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c ../extras/gui/controls/DirectoriesBox.ec -o $(OBJ)DirectoriesBox.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
@@ -143,14 +185,11 @@ $(OBJ)IDESettings.c: ../ide/src/IDESettings.ec $(OBJ)IDESettings.sym | $(SYMBOLS
 $(OBJ)OldIDESettings.c: ../ide/src/OldIDESettings.ec $(OBJ)OldIDESettings.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c ../ide/src/OldIDESettings.ec -o $(OBJ)OldIDESettings.c -symbols $(OBJ)
 
-$(OBJ)PathBox.c: ../extras/gui/controls/PathBox.ec $(OBJ)PathBox.sym | $(SYMBOLS)
-       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c ../extras/gui/controls/PathBox.ec -o $(OBJ)PathBox.c -symbols $(OBJ)
-
 $(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)DirectoriesBox.c: ../extras/gui/controls/DirectoriesBox.ec $(OBJ)DirectoriesBox.sym | $(SYMBOLS)
-       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c ../extras/gui/controls/DirectoriesBox.ec -o $(OBJ)DirectoriesBox.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)
@@ -172,14 +211,11 @@ $(OBJ)IDESettings.o: $(OBJ)IDESettings.c
 $(OBJ)OldIDESettings.o: $(OBJ)OldIDESettings.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)OldIDESettings.c -o $(OBJ)OldIDESettings.o
 
-$(OBJ)PathBox.o: $(OBJ)PathBox.c
-       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)PathBox.c -o $(OBJ)PathBox.o
-
 $(OBJ)StringsBox.o: $(OBJ)StringsBox.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)StringsBox.c -o $(OBJ)StringsBox.o
 
-$(OBJ)DirectoriesBox.o: $(OBJ)DirectoriesBox.c
-       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)DirectoriesBox.c -o $(OBJ)DirectoriesBox.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
The Ecere SDK