[Scummvm-cvs-logs] SF.net SVN: scummvm:[52005] tools/branches/gsoc2010-decompiler

[pidgeot at users.sourceforge.net]

Revision: 52005
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52005&view=rev
Author:   pidgeot
Date:     2010-08-11 21:29:29 +0000 (Wed, 11 Aug 2010)

Log Message:
-----------
DECOMPILER: Support -mt suffix for Boost

Modified Paths:
--------------
    tools/branches/gsoc2010-decompiler/Makefile.common
    tools/branches/gsoc2010-decompiler/configure

Modified: tools/branches/gsoc2010-decompiler/Makefile.common
===================================================================
--- tools/branches/gsoc2010-decompiler/Makefile.common	2010-08-11 21:16:45 UTC (rev 52004)
+++ tools/branches/gsoc2010-decompiler/Makefile.common	2010-08-11 21:29:29 UTC (rev 52005)
@@ -243,7 +243,7 @@
 	decompiler/kyra/codegen.o
 
 decompile_LIBS := \
-	-lboost_program_options
+	-lboost_program_options$(BOOST_SUFFIX)
 
 # Decompiler tests
 -include decompiler/test/module.mk

Modified: tools/branches/gsoc2010-decompiler/configure
===================================================================
--- tools/branches/gsoc2010-decompiler/configure	2010-08-11 21:16:45 UTC (rev 52004)
+++ tools/branches/gsoc2010-decompiler/configure	2010-08-11 21:29:29 UTC (rev 52005)
@@ -322,7 +322,7 @@
 
   --disable-freetype       disable freetype (Japanese font) support [autodetect]
 
-  --with-boost-prefix      Prefix where Boost is installed (optional)
+  --with-boost-prefix=DIR  Prefix where Boost is installed (optional)
   --disable-boost          disable Boost support [autodetect]
 
 Some influential environment variables:
@@ -1022,9 +1022,16 @@
 int main(void) { boost::program_options::options_description generic("Generic options"); return 0; }
 EOF
 	cc_check $BOOST_CFLAGS $BOOST_LIBS -lboost_program_options && _boost=yes
+	add_to_config_mk_if_yes "$_boost" 'BOOST_SUFFIX = '
+
+	# If not working without suffix, try -mt suffix
+	if test "$_boost" = no ; then
+		cc_check $BOOST_CFLAGS $BOOST_LIBS -lboost_program_options-mt && _boost=yes
+		add_to_config_mk_if_yes "$_boost" 'BOOST_SUFFIX = -mt'
+	fi
 	add_to_config_mk_if_yes "$_boost" 'USE_BOOST = 1'
 	echo "$_boost"
-fi	
+fi
 
 #
 # Check for iconv


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