diff options
author | Thierry Crozat | 2010-06-17 18:54:37 +0000 |
---|---|---|
committer | Thierry Crozat | 2010-06-17 18:54:37 +0000 |
commit | 690203de7486b577dc8b34d1a2fa8b97b686d2f9 (patch) | |
tree | 60cee11dea4fcaa8ba4928e052b33b73f8c5e514 | |
parent | b56b3b9eadd82685da6f8973bc8775176e67f1ff (diff) | |
download | scummvm-rg350-690203de7486b577dc8b34d1a2fa8b97b686d2f9.tar.gz scummvm-rg350-690203de7486b577dc8b34d1a2fa8b97b686d2f9.tar.bz2 scummvm-rg350-690203de7486b577dc8b34d1a2fa8b97b686d2f9.zip |
Fix possible link error for scummvm-static (for MacOS X bundle) when USE_TRANSLATION is set but USE_TERMCONV is not.
svn-id: r49941
-rwxr-xr-x | configure | 1 | ||||
-rw-r--r-- | ports.mk | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -2351,6 +2351,7 @@ EOF 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 @@ -101,7 +101,7 @@ ifdef USE_ZLIB OSX_ZLIB ?= -lz endif -ifdef USE_TRANSLATION +ifdef USE_TERMCONV OSX_ICONV ?= -liconv endif |