Ecere Software / sdk / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ecere/Makefile; ecere.epj: Excluding incomplete Cocoa files breaking build
[sdk] / ecere / Makefile
diff --git a/ecere/Makefile b/ecere/Makefile
index b6224ae..1f33a84 100644 (file)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -97,7 +97,8 @@ _ECSOURCES1 = \
        src/gfx/drivers/gl3/glab.ec \
        src/gfx/drivers/gl3/immediate.ec \
        src/gfx/drivers/gl3/matrixStack.ec \
-       src/gfx/drivers/gl3/shading.ec \
+       src/gfx/drivers/gl3/shaders.ec \
+       src/gfx/drivers/gl3/defaultShader.ec \
        $(if $(WINDOWS_TARGET),src/gfx/drivers/Direct3D8DisplayDriver.ec,) \
        $(if $(WINDOWS_TARGET),src/gfx/drivers/Direct3D9DisplayDriver.ec,) \
        $(if $(WINDOWS_TARGET),src/gfx/drivers/DirectDrawDisplayDriver.ec,) \
@@ -109,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,) \
@@ -149,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,) \
@@ -246,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)
@@ -276,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)
@@ -393,8 +394,8 @@ RESOURCES3 = \
        locale/pt_BR.mo \
        locale/ru.mo \
        locale/zh_CN.mo \
-       src/gfx/drivers/gl3/fixed.frag \
-       src/gfx/drivers/gl3/fixed.vertex
+       src/gfx/drivers/gl3/default.frag \
+       src/gfx/drivers/gl3/default.vert
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -531,17 +532,17 @@ CECFLAGS += -cpp $(_CPP)
 all: objdir $(TARGET)
 
 objdir:
-       $(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
+       $(if $(wildcard $(OBJ)),,$(call mkdir,$(OBJ)))
 
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
-       @$(call rmq,$(OBJ)symbols.lst)
+       @$(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
@@ -558,12 +559,12 @@ ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
 endif
 ifdef WINDOWS_TARGET
-       $(call cpq,$(TARGET),../compiler/bootstrap/obj/bin.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/)
+       $(call cp,$(TARGET),../compiler/bootstrap/obj/bin.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/)
 endif
 else
        $(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
-       $(call cpq,$(TARGET),../$(HOST_SODESTDIR))
+       $(call cp,$(TARGET),../$(HOST_SODESTDIR))
 ifdef SHARED_LIBRARY_TARGET
 ifdef LINUX_HOST
        $(if $(basename $(VER)),ln -sf $(LP)$(MODULE)$(SO)$(VER) ../$(HOST_SODESTDIR)$(LP)$(MODULE)$(SO)$(basename $(VER)),)
@@ -572,13 +573,13 @@ endif
 endif
 
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
-       @$(call rmq,$(OBJ)objects.lst)
+       @$(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
@@ -602,7 +603,7 @@ endif
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)status/audioVolumeHigh.png $(RES)status/folderOpen.png "status"
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)unicode/derivedGeneralCategoryStripped.txt "unicode"
        $(EAR) aw$(EARFLAGS) $(TARGET) locale/es.mo locale/hu.mo locale/mr.mo locale/nl.mo locale/pt_BR.mo locale/ru.mo locale/zh_CN.mo "locale"
-       $(EAR) aw$(EARFLAGS) $(TARGET) src/gfx/drivers/gl3/fixed.frag src/gfx/drivers/gl3/fixed.vertex "shaders"
+       $(EAR) aw$(EARFLAGS) $(TARGET) src/gfx/drivers/gl3/default.frag src/gfx/drivers/gl3/default.vert "shaders"
 else
 ifdef WINDOWS_HOST
        $(AR) rcs $(TARGET) @$(OBJ)objects.lst $(LIBS)
@@ -610,8 +611,8 @@ else
        $(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
 endif
-       $(call mkdirq,../$(SODESTDIR))
-       $(call cpq,$(TARGET),../$(SODESTDIR))
+       $(call mkdir,../$(SODESTDIR))
+       $(call cp,$(TARGET),../$(SODESTDIR))
 ifdef SHARED_LIBRARY_TARGET
 ifdef LINUX_TARGET
 ifdef LINUX_HOST
@@ -748,8 +749,11 @@ $(OBJ)immediate.sym: src/gfx/drivers/gl3/immediate.ec
 $(OBJ)matrixStack.sym: src/gfx/drivers/gl3/matrixStack.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/gl3/matrixStack.ec -o $(OBJ)matrixStack.sym
 
-$(OBJ)shading.sym: src/gfx/drivers/gl3/shading.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/gl3/shading.ec -o $(OBJ)shading.sym
+$(OBJ)shaders.sym: src/gfx/drivers/gl3/shaders.ec
+       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/gl3/shaders.ec -o $(OBJ)shaders.sym
+
+$(OBJ)defaultShader.sym: src/gfx/drivers/gl3/defaultShader.ec
+       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/gl3/defaultShader.ec -o $(OBJ)defaultShader.sym
 
 ifneq ($(WINDOWS_TARGET),)
 $(OBJ)Direct3D8DisplayDriver.sym: src/gfx/drivers/Direct3D8DisplayDriver.ec
@@ -1181,8 +1185,11 @@ $(OBJ)immediate.c: src/gfx/drivers/gl3/immediate.ec $(OBJ)immediate.sym | $(SYMB
 $(OBJ)matrixStack.c: src/gfx/drivers/gl3/matrixStack.ec $(OBJ)matrixStack.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/gl3/matrixStack.ec -o $(OBJ)matrixStack.c -symbols $(OBJ)
 
-$(OBJ)shading.c: src/gfx/drivers/gl3/shading.ec $(OBJ)shading.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/gl3/shading.ec -o $(OBJ)shading.c -symbols $(OBJ)
+$(OBJ)shaders.c: src/gfx/drivers/gl3/shaders.ec $(OBJ)shaders.sym | $(SYMBOLS)
+       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/gl3/shaders.ec -o $(OBJ)shaders.c -symbols $(OBJ)
+
+$(OBJ)defaultShader.c: src/gfx/drivers/gl3/defaultShader.ec $(OBJ)defaultShader.sym | $(SYMBOLS)
+       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/gl3/defaultShader.ec -o $(OBJ)defaultShader.c -symbols $(OBJ)
 
 ifneq ($(WINDOWS_TARGET),)
 $(OBJ)Direct3D8DisplayDriver.c: src/gfx/drivers/Direct3D8DisplayDriver.ec $(OBJ)Direct3D8DisplayDriver.sym | $(SYMBOLS)
@@ -1932,8 +1939,11 @@ $(OBJ)immediate.o: $(OBJ)immediate.c
 $(OBJ)matrixStack.o: $(OBJ)matrixStack.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)matrixStack.c -o $(OBJ)matrixStack.o
 
-$(OBJ)shading.o: $(OBJ)shading.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)shading.c -o $(OBJ)shading.o
+$(OBJ)shaders.o: $(OBJ)shaders.c
+       $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)shaders.c -o $(OBJ)shaders.o
+
+$(OBJ)defaultShader.o: $(OBJ)defaultShader.c
+       $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)defaultShader.c -o $(OBJ)defaultShader.o
 
 $(OBJ)Window.o: $(OBJ)Window.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)Window.c -o $(OBJ)Window.o
@@ -2008,51 +2018,55 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleaneceretarget: objdir
-       $(call rmq,$(TARGET))
+       $(call rm,$(TARGET))
 
 cleantarget: objdir
-       $(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
-       $(call rmq,$(OBJ)symbols.lst)
-       $(call rmq,$(OBJ)objects.lst)
-       $(call rmq,$(TARGET))
+       $(call rm,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+       $(call rm,$(OBJ)symbols.lst)
+       $(call rm,$(OBJ)objects.lst)
+       $(call rm,$(TARGET))
 ifdef SHARED_LIBRARY_TARGET
 ifdef LINUX_TARGET
 ifdef LINUX_HOST
-       $(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
-       $(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+       $(call rm,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+       $(call rm,$(OBJ)$(LP)$(MODULE)$(SO))
 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 rmq,$(_OBJECTS))
-       $(call rmq,$(ECOBJECTS1))
-       $(call rmq,$(ECOBJECTS2))
-       $(call rmq,$(ECOBJECTS3))
-       $(call rmq,$(COBJECTS1))
-       $(call rmq,$(COBJECTS2))
-       $(call rmq,$(COBJECTS3))
-       $(call rmq,$(BOWLS1))
-       $(call rmq,$(BOWLS2))
-       $(call rmq,$(BOWLS3))
-       $(call rmq,$(IMPORTS1))
-       $(call rmq,$(IMPORTS2))
-       $(call rmq,$(IMPORTS3))
-       $(call rmq,$(SYMBOLS1))
-       $(call rmq,$(SYMBOLS2))
-       $(call rmq,$(SYMBOLS3))
-       $(MAKE) -f Makefile.ecereCOM clean
-       $(MAKE) -f Makefile.vanilla clean
+       $(call rm,$(_OBJECTS))
+       $(call rm,$(ECOBJECTS1))
+       $(call rm,$(ECOBJECTS2))
+       $(call rm,$(ECOBJECTS3))
+       $(call rm,$(COBJECTS1))
+       $(call rm,$(COBJECTS2))
+       $(call rm,$(COBJECTS3))
+       $(call rm,$(BOWLS1))
+       $(call rm,$(BOWLS2))
+       $(call rm,$(BOWLS3))
+       $(call rm,$(IMPORTS1))
+       $(call rm,$(IMPORTS2))
+       $(call rm,$(IMPORTS3))
+       $(call rm,$(SYMBOLS1))
+       $(call rm,$(SYMBOLS2))
+       $(call rm,$(SYMBOLS3))
+       $(_MAKE) -f Makefile.ecereCOM clean
+       $(_MAKE) -f Makefile.vanilla clean
 
 realclean: cleantarget
-       $(call rmrq,$(OBJ))
-       $(MAKE) -f Makefile.ecereCOM realclean
-       $(MAKE) -f Makefile.vanilla realclean
+       $(call rmr,$(OBJ))
+       $(_MAKE) -f Makefile.ecereCOM realclean
+       $(_MAKE) -f Makefile.vanilla realclean
+
+distclean:
+       $(_MAKE) -f $(_CF_DIR)Cleanfile distclean distclean_all_subdirs
 
-distclean: cleantarget
-       $(call rmrq,obj/)
+Makefile: ;
+$(_CF_DIR)crossplatform.mk: ;
+$(_CF_DIR)default.cf: ;
 
 #troubleshoot:
 #      @$(call echo,OBJECTS = $(OBJECTS))
The Ecere SDK