[Scummvm-cvs-logs] scummvm-tools master -> 675c4db0ed607a979b070bd0c7686df0b76e3f8d

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
675c4db0ed BUILD: Use compiler given by wx-config to build GUI tools


Commit: 675c4db0ed607a979b070bd0c7686df0b76e3f8d
    https://github.com/scummvm/scummvm-tools/commit/675c4db0ed607a979b070bd0c7686df0b76e3f8d
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2014-03-12T22:16:56Z

Commit Message:
BUILD: Use compiler given by wx-config to build GUI tools

This is needed to make sure we get a working executable. For example
on OS X 10.9 without this we get an executable that crashes before entering
main() because it links against libc++ but wx-widgets is built against
libstdc++. See bugs #15589 and #15618 on wx-widgets bug tracker.

Changed paths:
    configure



diff --git a/configure b/configure
index 38712a1..b962fc3 100755
--- a/configure
+++ b/configure
@@ -1517,6 +1517,9 @@ fi
 if test "$_wxwidgets" = yes ; then
 	_wxincludes="`$_wxconfig --prefix="$_wxpath" --cflags`"
 	_wxlibs="`$_wxconfig --prefix="$_wxpath" --libs`"
+	# Use the compiler specified by wx-config. This is needed on some systems to get a working executable.
+	CXX="`$_wxconfig --cxx`"
+	LD=$CXX
 
 echo_n "Checking for wxwidgets gui dev component... "
 	has_wx_gui_dev=no