[Scummvm-cvs-logs] SF.net SVN: scummvm:[48629] tools/trunk/configure

criezy at users.sourceforge.net criezy at users.sourceforge.net
Sun Apr 11 21:57:28 CEST 2010


Revision: 48629
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48629&view=rev
Author:   criezy
Date:     2010-04-11 19:57:27 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
Fix bug #2984225: TOOLS: configure should check if libwxgtk2.8-dev is installed

Modified Paths:
--------------
    tools/trunk/configure

Modified: tools/trunk/configure
===================================================================
--- tools/trunk/configure	2010-04-11 19:04:24 UTC (rev 48628)
+++ tools/trunk/configure	2010-04-11 19:57:27 UTC (rev 48629)
@@ -196,7 +196,7 @@
 				if test `basename $path_dir` = bin ; then
 					_wxpath=`dirname $path_dir`
 				fi
-				# break at first sdl-config found in path
+				# break at first wx-config found in path
 				break 2
 			fi
 		done
@@ -1073,6 +1073,42 @@
 if test "$_wxwidgets" = yes ; then
 	_wxincludes="`$_wxconfig --prefix="$_wxpath" --cflags`"
 	_wxlibs="`$_wxconfig --prefix="$_wxpath" --libs`"
+
+echo_n "Checking for wxwidgets gui dev component... "
+	has_wx_gui_dev=no
+
+	cat > $TMPC << EOF
+#include <wx/wx.h>
+
+class Foo : public wxFrame {
+public:
+	Foo(const wxString& title) : wxFrame(NULL, wxID_ANY, title) {}
+};
+
+class FooApp : public wxApp {
+public:
+	virtual bool OnInit();
+};
+
+IMPLEMENT_APP(FooApp)
+
+bool FooApp::OnInit() {
+    Foo *foo = new Foo(wxT("Foo"));
+    foo->Show(true);
+    return true;
+}
+EOF
+	cc_check $LDFLAGS $CXXFLAGS $_wxincludes $_wxlibs && has_wx_gui_dev=yes
+
+	if test "$has_wx_gui_dev" = no ; then
+		_wxincludes=""
+		_wxlibs=""
+		_wxwidgets=no
+		echo "not found"
+	else
+		echo "found"
+	fi
+
 fi
 add_to_config_mk_if_yes "$_wxwidgets" 'USE_WXWIDGETS = 1'
 


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