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

criezy at users.sourceforge.net criezy at users.sourceforge.net
Thu Jun 17 20:54:37 CEST 2010


Revision: 49941
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49941&view=rev
Author:   criezy
Date:     2010-06-17 18:54:37 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
Fix possible link error for scummvm-static (for MacOS X bundle) when USE_TRANSLATION is set but USE_TERMCONV is not.

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

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-06-17 18:47:25 UTC (rev 49940)
+++ scummvm/trunk/configure	2010-06-17 18:54:37 UTC (rev 49941)
@@ -2351,6 +2351,7 @@
 		cc_check_no_clean $LDFLAGS $CXXFLAGS && _termconv=yes
 		cc_check $LDFLAGS $CXXFLAGS -liconv && LIBS="$LIBS -liconv" && _termconv=yes
 
+		add_to_config_mk_if_yes $_termconv 'USE_TERMCONV = 1'
 		add_to_config_h_if_yes $_termconv '#define USE_TERMCONV'
 		if test "$_termconv" = yes ; then
 			uses_const=no

Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk	2010-06-17 18:47:25 UTC (rev 49940)
+++ scummvm/trunk/ports.mk	2010-06-17 18:54:37 UTC (rev 49941)
@@ -101,7 +101,7 @@
 OSX_ZLIB ?= -lz
 endif
 
-ifdef USE_TRANSLATION
+ifdef USE_TERMCONV
 OSX_ICONV ?= -liconv
 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