ecere/sys/ECON: Fixed ECON Hexadecimal Support; Using it for bit classes

[sdk] / ecere / Makefile

diff --git a/ecere/Makefile b/ecere/Makefile
index 4de114a..1f33a84 100644 (file)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -110,7 +110,7 @@ _ECSOURCES1 = \
        $(if $(DISABLE_GL),,src/gfx/drivers/OpenGLDisplayDriver.ec) \
        $(if $(WINDOWS_TARGET),src/gfx/drivers/Win32BitmapPrinterDisplayDriver.ec,)
 _ECSOURCES2 = \
-       $(if $(OSX_TARGET),src/gfx/drivers/CocoaOpenGLDisplayDriver.ec,) \
+       $(if ,src/gfx/drivers/CocoaOpenGLDisplayDriver.ec,) \
        $(if $(WINDOWS_TARGET),src/gfx/drivers/Win32ConsoleDisplayDriver.ec,) \
        $(if $(WINDOWS_TARGET),src/gfx/drivers/Win32PrinterDisplayDriver.ec,) \
        $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gfx/drivers/XDisplayDriver.ec,) \
@@ -150,8 +150,8 @@ _ECSOURCES2 = \
        src/gui/dialogs/MessageBox.ec \
        src/gui/dialogs/ReplaceDialog.ec \
        src/gui/dialogs/WindowList.ec \
-       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaDispatch.ec,) \
-       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaInterface.ec,)
+       $(if ,src/gui/drivers/cocoa/CocoaDispatch.ec,) \
+       $(if ,src/gui/drivers/cocoa/CocoaInterface.ec,)
 _ECSOURCES3 = \
        $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gui/drivers/NCursesInterface.ec,) \
        $(if $(WINDOWS_TARGET),src/gui/drivers/Win32Interface.ec,) \
@@ -247,8 +247,8 @@ _OBJECTS = \
        $(OBJ)harfbuzz-impl.o \
        $(OBJ)harfbuzz-thai.o \
        $(OBJ)gl_compat_4_4.o \
-       $(if $(OSX_TARGET),$(OBJ)CocoaEcereBridge.o,) \
-       $(if $(OSX_TARGET),$(OBJ)EcereView.o,) \
+       $(if ,$(OBJ)CocoaEcereBridge.o,) \
+       $(if ,$(OBJ)EcereView.o,) \
        $(OBJ)instance.c.o
 
 OBJECTS = $(_OBJECTS) $(ECOBJECTS) $(OBJ)$(MODULE).main$(O)
@@ -277,8 +277,8 @@ SOURCES = $(ECSOURCES) \
        src/gfx/drivers/harfbuzz/harfbuzz-impl.c \
        src/gfx/drivers/harfbuzz/harfbuzz-thai.c \
        src/gfx/drivers/gl3/gl_compat_4_4.c \
-       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaEcereBridge.m,) \
-       $(if $(OSX_TARGET),src/gui/drivers/cocoa/EcereView.m,) \
+       $(if ,src/gui/drivers/cocoa/CocoaEcereBridge.m,) \
+       $(if ,src/gui/drivers/cocoa/EcereView.m,) \
        src/com/instance.c
 
 RESOURCES = $(RESOURCES1) $(RESOURCES2) $(RESOURCES3)
@@ -537,12 +537,12 @@ objdir:
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
        @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
-       @$(call echo,$(SYMBOLS1)) >> $(OBJ)symbols.lst
-       @$(call echo,$(SYMBOLS2)) >> $(OBJ)symbols.lst
-       @$(call echo,$(SYMBOLS3)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS1)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS2)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS3)) >> $(OBJ)symbols.lst
+       $(call addtolistfile,$(SYMBOLS1),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(SYMBOLS2),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(SYMBOLS3),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS1),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS2),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS3),$(OBJ)symbols.lst)
        $(ECS) $(ARCH_FLAGS) $(ECSLIBOPT) @$(OBJ)symbols.lst -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(OBJ)$(MODULE).main.ec
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
@@ -575,11 +575,11 @@ endif
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
        @$(call rm,$(OBJ)objects.lst)
        @$(call touch,$(OBJ)objects.lst)
-       @$(call echo,$(_OBJECTS)) >> $(OBJ)objects.lst
-       @$(call echo,$(OBJ)$(MODULE).main$(O)) >> $(OBJ)objects.lst
-       @$(call echo,$(ECOBJECTS1)) >> $(OBJ)objects.lst
-       @$(call echo,$(ECOBJECTS2)) >> $(OBJ)objects.lst
-       @$(call echo,$(ECOBJECTS3)) >> $(OBJ)objects.lst
+       $(call addtolistfile,$(_OBJECTS),$(OBJ)objects.lst)
+       $(call addtolistfile,$(OBJ)$(MODULE).main$(O),$(OBJ)objects.lst)
+       $(call addtolistfile,$(ECOBJECTS1),$(OBJ)objects.lst)
+       $(call addtolistfile,$(ECOBJECTS2),$(OBJ)objects.lst)
+       $(call addtolistfile,$(ECOBJECTS3),$(OBJ)objects.lst)
 ifndef STATIC_LIBRARY_TARGET
        $(CC) $(OFLAGS) @$(OBJ)objects.lst $(LIBS) -o $(TARGET) $(SONAME) $(INSTALLNAME)
 ifndef NOSTRIP
@@ -2033,8 +2033,8 @@ ifdef LINUX_HOST
 endif
 endif
 endif
-       $(MAKE) -f Makefile.ecereCOM cleantarget
-       $(MAKE) -f Makefile.vanilla cleantarget
+       $(_MAKE) -f Makefile.ecereCOM cleantarget
+       $(_MAKE) -f Makefile.vanilla cleantarget
 
 clean: cleantarget
        $(call rm,$(_OBJECTS))
@@ -2053,13 +2053,13 @@ clean: cleantarget
        $(call rm,$(SYMBOLS1))
        $(call rm,$(SYMBOLS2))
        $(call rm,$(SYMBOLS3))
-       $(MAKE) -f Makefile.ecereCOM clean
-       $(MAKE) -f Makefile.vanilla clean
+       $(_MAKE) -f Makefile.ecereCOM clean
+       $(_MAKE) -f Makefile.vanilla clean
 
 realclean: cleantarget
        $(call rmr,$(OBJ))
-       $(MAKE) -f Makefile.ecereCOM realclean
-       $(MAKE) -f Makefile.vanilla realclean
+       $(_MAKE) -f Makefile.ecereCOM realclean
+       $(_MAKE) -f Makefile.vanilla realclean
 
 distclean:
        $(_MAKE) -f $(_CF_DIR)Cleanfile distclean distclean_all_subdirs