[Scummvm-cvs-logs] SF.net SVN: scummvm: [30180] scummvm/branches/branch-0-11-0/backends/ platform/dc/Makefile

marcus_c at users.sourceforge.net marcus_c at users.sourceforge.net
Thu Jan 3 08:23:13 CET 2008


Revision: 30180
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30180&view=rev
Author:   marcus_c
Date:     2008-01-02 23:23:12 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------
Remove $(srcdir)/common from the include path (fixes <zlib.h> conflict).

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/backends/platform/dc/Makefile

Modified: scummvm/branches/branch-0-11-0/backends/platform/dc/Makefile
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/dc/Makefile	2008-01-03 03:34:40 UTC (rev 30179)
+++ scummvm/branches/branch-0-11-0/backends/platform/dc/Makefile	2008-01-03 07:23:12 UTC (rev 30180)
@@ -13,7 +13,7 @@
 CXXFLAGS= -O3 -Wno-multichar -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks -fno-exceptions
 DEFINES = -D__DC__ -DNONSTANDARD_PORT -DUSE_MAD -DUSE_ZLIB -DNOSERIAL
 LDFLAGS = -Wl,-Ttext,0x8c010000 -nostartfiles $(ronindir)/lib/crt0.o
-INCLUDES= -I./ -I$(srcdir) -I$(srcdir)/common -I$(ronindir)/include/ -I$(srcdir)/engines
+INCLUDES= -I./ -I$(srcdir) -I$(ronindir)/include/ -I$(srcdir)/engines
 LIBS	= -L$(ronindir)/lib -lmad -lronin-noserial -lz -lm
 EXECUTABLE = scummvm.elf
 PLUGIN_PREFIX =


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list