[Scummvm-cvs-logs] SF.net SVN: scummvm:[53463] scummvm/trunk

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Fri Oct 15 05:33:55 CEST 2010


Revision: 53463
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53463&view=rev
Author:   mthreepwood
Date:     2010-10-15 03:33:54 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
MACOSX: Fix make bundle when compiling with libpng

Modified Paths:
--------------
    scummvm/trunk/configure
    scummvm/trunk/ports.mk

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-10-14 22:33:32 UTC (rev 53462)
+++ scummvm/trunk/configure	2010-10-15 03:33:54 UTC (rev 53463)
@@ -2388,7 +2388,7 @@
 	LIBS="$LIBS $PNG_LIBS -lpng"
 	INCLUDES="$INCLUDES $PNG_CFLAGS"
 fi
-define_in_config_h_if_yes "$_png" 'USE_PNG'
+define_in_config_if_yes "$_png" 'USE_PNG'
 echo "$_png"
 
 if test `get_engine_build sword25` = yes && test ! "$_png" = yes ; then

Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk	2010-10-14 22:33:32 UTC (rev 53462)
+++ scummvm/trunk/ports.mk	2010-10-15 03:33:54 UTC (rev 53463)
@@ -98,6 +98,10 @@
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libmpeg2.a
 endif
 
+ifdef USE_PNG
+OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libpng.a
+endif
+
 ifdef USE_ZLIB
 OSX_ZLIB ?= -lz
 endif


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