sdk/Build System: Synced up latest changes to makefiles

diff --git a/compiler/bootstrap/ecc/Makefile b/compiler/bootstrap/ecc/Makefile
index 9fe70d6..310a758 100644 (file)
--- a/compiler/bootstrap/ecc/Makefile
+++ b/compiler/bootstrap/ecc/Makefile
@@ -59,7 +59,6 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w \
                         -DECERE_STATIC
 

diff --git a/compiler/bootstrap/ecere/Makefile b/compiler/bootstrap/ecere/Makefile
index 64a2192..959d7e9 100644 (file)
--- a/compiler/bootstrap/ecere/Makefile
+++ b/compiler/bootstrap/ecere/Makefile
@@ -105,7 +105,6 @@ LIBS +=
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w \
         -DBUILDING_ECERE_COM -DECERE_STATIC -DECERE_BOOTSTRAP
 ECFLAGS += \

diff --git a/compiler/bootstrap/ecp/Makefile b/compiler/bootstrap/ecp/Makefile
index 5fdaac6..1345741 100644 (file)
--- a/compiler/bootstrap/ecp/Makefile
+++ b/compiler/bootstrap/ecp/Makefile
@@ -59,9 +59,8 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w \
-        -DECERE_STATIC
+                        -DECERE_STATIC
 
 
 ECFLAGS += \

diff --git a/compiler/bootstrap/ecs/Makefile b/compiler/bootstrap/ecs/Makefile
index ac8673b..9268165 100644 (file)
--- a/compiler/bootstrap/ecs/Makefile
+++ b/compiler/bootstrap/ecs/Makefile
@@ -59,9 +59,8 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w \
-        -DECERE_STATIC
+                        -DECERE_STATIC
 
 
 ECFLAGS += \

diff --git a/compiler/bootstrap/libec/Makefile b/compiler/bootstrap/libec/Makefile
index 6acdca6..a1d432a 100644 (file)
--- a/compiler/bootstrap/libec/Makefile
+++ b/compiler/bootstrap/libec/Makefile
@@ -95,7 +95,6 @@ LIBS +=
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w \
                         -DECERE_STATIC
 ECFLAGS += \

diff --git a/compiler/ecp/ecp.epj b/compiler/ecp/ecp.epj
index 1d98e7b..1c2f7f2 100644 (file)
--- a/compiler/ecp/ecp.epj
+++ b/compiler/ecp/ecp.epj
@@ -84,22 +84,6 @@
                      "dl"
                   ]
                }
-            },
-            {
-               "Name" : "Win32",
-               "Options" : {
-                  "Libraries" : [
-                     "winmm",
-                     "ws2_32",
-                     "kernel32",
-                     "user32",
-                     "gdi32",
-                     "mpr",
-                     "advapi32",
-                     "shell32",
-                     "imm32"
-                  ]
-               }
             }
          ]
       }

diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile
index 3cd765a..8879d09 100755 (executable)
--- a/compiler/libec/Makefile
+++ b/compiler/libec/Makefile
@@ -104,7 +104,6 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w
 
 CUSTOM1_CFLAGS = \

diff --git a/documentor/Makefile b/documentor/Makefile
index 17b7cdf..4abcfb7 100755 (executable)
--- a/documentor/Makefile
+++ b/documentor/Makefile
@@ -82,7 +82,6 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w
 
 

diff --git a/ear/cmd/Makefile b/ear/cmd/Makefile
index 52836ac..fbb1483 100755 (executable)
--- a/ear/cmd/Makefile
+++ b/ear/cmd/Makefile
@@ -75,7 +75,6 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w
 
 

diff --git a/ear/extract/Makefile b/ear/extract/Makefile
index e13131b..6d8bd6e 100755 (executable)
--- a/ear/extract/Makefile
+++ b/ear/extract/Makefile
@@ -103,7 +103,6 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(DEBUG), -g, -Os) $(FORCE_32_BIT) $(FPIC) -w \
                         -DECERE_STATIC
 

diff --git a/ecere/Makefile b/ecere/Makefile
index 8aef6cb..38453ce 100755 (executable)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -37,7 +37,7 @@ include $(_CF_DIR)default.cf
 
 # POST-INCLUDES VARIABLES
 
-OBJ = obj/$(CONFIG).$(PLATFORM)/
+OBJ = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/
 
 RES = res/
 
@@ -45,7 +45,7 @@ ifdef LINUX_TARGET
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)$(MODULE)$(SO).0.44
 SONAME = -Wl,-soname,libecere.so.0
 else
-TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)$(MODULE)$(SO)
+TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)$(MODULE)$(SO)
 SONAME =
 endif
 
@@ -386,7 +386,6 @@ endif
 
 # Careful to keep ../deps/glext as -isystem instead of generated -I
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(WINDOWS_TARGET), \
                         -isystem ../deps/glext \
                         -I../deps/DirectX-9.0/include \

diff --git a/eda/drivers/sqlite/EDASQLite.epj b/eda/drivers/sqlite/EDASQLite.epj
index 66391c0..25a14fe 100755 (executable)
--- a/eda/drivers/sqlite/EDASQLite.epj
+++ b/eda/drivers/sqlite/EDASQLite.epj
@@ -6,8 +6,6 @@
       "Optimization" : "None",
       "TargetType" : "SharedLibrary",
       "TargetFileName" : "EDASQLite",
-      "TargetDirectory" : "obj/$(CONFIG).$(PLATFORM)",
-      "ObjectsDirectory" : "obj/$(CONFIG).$(PLATFORM)",
       "Libraries" : [
          "ecere",
          "ffi"

diff --git a/eda/drivers/sqlite/Makefile b/eda/drivers/sqlite/Makefile
index 79e4175..b846e32 100755 (executable)
--- a/eda/drivers/sqlite/Makefile
+++ b/eda/drivers/sqlite/Makefile
@@ -36,7 +36,7 @@ include $(_CF_DIR)default.cf
 
 # POST-INCLUDES VARIABLES
 
-OBJ = obj/$(CONFIG).$(PLATFORM)/
+OBJ = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/
 
 RES = 
 
@@ -44,7 +44,7 @@ ifdef LINUX_TARGET
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)EDASQLite$(SO).0.44
 SONAME = -Wl,-soname,$(LP)EDASQLite$(SO).0
 else
-TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)EDASQLite$(SO)
+TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SO)
 SONAME =
 endif
 
@@ -84,13 +84,11 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(WINDOWS_TARGET), \
                         -I../../../deps/libffi-3.0.11/i686-pc-mingw32/include,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w
 
 CUSTOM1_CFLAGS = \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(WINDOWS_TARGET), \
                         -I../../../deps/libffi-3.0.11/i686-pc-mingw32/include,) \
         $(if $(DEBUG), -g, -O2) $(FORCE_32_BIT) $(FPIC) -w
@@ -144,7 +142,6 @@ ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \
         -L../../../obj/$(PLATFORM)/bin \
         -L../../../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
 endif
 
 # TARGETS
@@ -155,7 +152,7 @@ objdir:
        $(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
 
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
-       $(ECS) $(ECSLIBOPT) $(SYMBOLS) $(IMPORTS) -symbols obj/$(CONFIG).$(PLATFORM) -o $(OBJ)$(MODULE).main.ec
+       $(ECS) $(ECSLIBOPT) $(SYMBOLS) $(IMPORTS) -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(OBJ)$(MODULE).main.ec
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c $(OBJ)$(MODULE).main.ec -o $(OBJ)$(MODULE).main.sym -symbols $(OBJ)

diff --git a/eda/drivers/sqliteCipher/EDASQLiteCipher.epj b/eda/drivers/sqliteCipher/EDASQLiteCipher.epj
index 729b29e..02e407a 100644 (file)
--- a/eda/drivers/sqliteCipher/EDASQLiteCipher.epj
+++ b/eda/drivers/sqliteCipher/EDASQLiteCipher.epj
@@ -9,8 +9,6 @@
       ],
       "TargetType" : "SharedLibrary",
       "TargetFileName" : "EDASQLiteCipher",
-      "TargetDirectory" : "obj/$(CONFIG).$(PLATFORM)",
-      "ObjectsDirectory" : "obj/$(CONFIG).$(PLATFORM)",
       "Libraries" : [
          "ecere",
          "ffi"

diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile
index 323b1e6..c10a16a 100755 (executable)
--- a/eda/drivers/sqliteCipher/Makefile
+++ b/eda/drivers/sqliteCipher/Makefile
@@ -36,7 +36,7 @@ include $(_CF_DIR)default.cf
 
 # POST-INCLUDES VARIABLES
 
-OBJ = obj/$(CONFIG).$(PLATFORM)/
+OBJ = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/
 
 RES = 
 
@@ -44,7 +44,7 @@ ifdef LINUX_TARGET
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)EDASQLiteCipher$(SO).0.44
 SONAME = -Wl,-soname,$(LP)EDASQLiteCipher$(SO).0
 else
-TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)EDASQLiteCipher$(SO)
+TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLiteCipher$(SO)
 SONAME =
 endif
 
@@ -85,7 +85,6 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(WINDOWS_TARGET), \
                         -I$(OPENSSL_INCLUDE_DIR) \
                         -I../../../deps/libffi-3.0.11/i686-pc-mingw32/include,) \
@@ -93,7 +92,6 @@ CFLAGS += \
                         -DSQLITE_HAS_CODEC
 
 CUSTOM1_CFLAGS = \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(WINDOWS_TARGET), \
                         -I$(OPENSSL_INCLUDE_DIR) \
                         -I../../../deps/libffi-3.0.11/i686-pc-mingw32/include,) \
@@ -153,7 +151,6 @@ ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \
         -L../../../obj/$(PLATFORM)/bin \
         -L../../../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
 endif
 
 # TARGETS
@@ -164,7 +161,7 @@ objdir:
        $(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
 
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
-       $(ECS) $(ECSLIBOPT) $(SYMBOLS) $(IMPORTS) -symbols obj/$(CONFIG).$(PLATFORM) -o $(OBJ)$(MODULE).main.ec
+       $(ECS) $(ECSLIBOPT) $(SYMBOLS) $(IMPORTS) -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(OBJ)$(MODULE).main.ec
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c $(OBJ)$(MODULE).main.ec -o $(OBJ)$(MODULE).main.sym -symbols $(OBJ)

diff --git a/eda/libeda/EDA.epj b/eda/libeda/EDA.epj
index 449f622..a29832b 100644 (file)
--- a/eda/libeda/EDA.epj
+++ b/eda/libeda/EDA.epj
@@ -6,8 +6,6 @@
       "DefaultNameSpace" : "eda",
       "TargetType" : "SharedLibrary",
       "TargetFileName" : "EDA",
-      "TargetDirectory" : "obj/$(CONFIG).$(PLATFORM)",
-      "ObjectsDirectory" : "obj/$(CONFIG).$(PLATFORM)",
       "Libraries" : [
          "ecere"
       ]

diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile
index 9ae621a..0316b90 100755 (executable)
--- a/eda/libeda/Makefile
+++ b/eda/libeda/Makefile
@@ -36,7 +36,7 @@ include $(_CF_DIR)default.cf
 
 # POST-INCLUDES VARIABLES
 
-OBJ = obj/$(CONFIG).$(PLATFORM)/
+OBJ = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/
 
 RES = 
 
@@ -44,7 +44,7 @@ ifdef LINUX_TARGET
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)EDA$(SO).0.44
 SONAME = -Wl,-soname,$(LP)EDA$(SO).0
 else
-TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)EDA$(SO)
+TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SO)
 SONAME =
 endif
 
@@ -86,7 +86,6 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(WINDOWS_TARGET), \
                         -I../../deps/libffi-3.0.11/i686-pc-mingw32/include,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w
@@ -127,7 +126,7 @@ objdir:
        $(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
 
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
-       $(ECS) $(ECSLIBOPT) $(SYMBOLS) $(IMPORTS) -symbols obj/$(CONFIG).$(PLATFORM) -o $(OBJ)$(MODULE).main.ec
+       $(ECS) $(ECSLIBOPT) $(SYMBOLS) $(IMPORTS) -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(OBJ)$(MODULE).main.ec
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c $(OBJ)$(MODULE).main.ec -o $(OBJ)$(MODULE).main.sym -symbols $(OBJ)

diff --git a/epj2make/Makefile b/epj2make/Makefile
index 3caed53..f7a5b9b 100755 (executable)
--- a/epj2make/Makefile
+++ b/epj2make/Makefile
@@ -81,7 +81,6 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FORCE_32_BIT) $(FPIC) -w \
                         -DMAKEFILE_GENERATOR
 

diff --git a/ide/Makefile b/ide/Makefile
index 43f7059..35572b5 100755 (executable)
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -172,7 +172,6 @@ LIBS += \
 endif
 
 CFLAGS += \
-        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
         $(if $(LINUX_TARGET), \
                         -I/usr/X11R6/include,) \
         $(if $(OSX_TARGET), \