ecere: Fixed OS X build

[sdk] / ecere / Makefile

diff --git a/ecere/Makefile b/ecere/Makefile
index f6bb396..1ede552 100644 (file)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -399,7 +399,6 @@ endif
 PRJ_CFLAGS += \
         $(if $(WINDOWS_TARGET), \
                         -isystem ../deps/glext \
-                        -I../deps/DirectX-9.0/include \
                         -I../deps/jpeg-9a \
                         -I../deps/libpng-1.6.12 \
                         -I../deps/libungif-4.1.1/lib \
@@ -414,6 +413,7 @@ PRJ_CFLAGS += \
                         -I$(SYSROOT)/usr/X11/include \
                         -I/usr/X11R6/include/freetype2 \
                         -I/usr/X11R6/include \
+                        -Isrc/gui/drivers/cocoa \
                         -I../deps/jpeg-9a \
                         -I../deps/libpng-1.6.12 \
                         -I../deps/libungif-4.1.1/lib,) \
@@ -492,7 +492,6 @@ OFLAGS += \
         -L$(SYSROOT)/usr/X11/lib \
         -L/usr/X11R6/lib \
         -L../deps/jpeg-9a/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
-        -L../deps/libpng-1.6.12/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
         -L../deps/libungif-4.1.1/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)
 LIBS += \
        $(call _L,curses) \
@@ -592,7 +591,11 @@ endif
        $(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"
 else
+ifdef WINDOWS_HOST
        $(AR) rcs $(TARGET) @$(OBJ)objects.lst $(LIBS)
+else
+       $(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
+endif
 endif
        $(call mkdirq,../$(SODESTDIR))
        $(call cpq,$(TARGET),../$(SODESTDIR))