[Scummvm-cvs-logs] SF.net SVN: scummvm:[46645] tools/branches/gsoc2009-gui

sev at users.sourceforge.net sev at users.sourceforge.net
Sun Dec 27 15:17:27 CET 2009


Revision: 46645
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46645&view=rev
Author:   sev
Date:     2009-12-27 14:17:27 +0000 (Sun, 27 Dec 2009)

Log Message:
-----------
Made tools_gui compilable only when wxWidgets is present.

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/Makefile.common
    tools/branches/gsoc2009-gui/configure

Modified: tools/branches/gsoc2009-gui/Makefile.common
===================================================================
--- tools/branches/gsoc2009-gui/Makefile.common	2009-12-27 14:13:39 UTC (rev 46644)
+++ tools/branches/gsoc2009-gui/Makefile.common	2009-12-27 14:17:27 UTC (rev 46645)
@@ -65,14 +65,18 @@
 	descumm$(EXEEXT) \
 	desword2$(EXEEXT) \
 	degob$(EXEEXT) \
-	tools_cli$(EXEEXT) \
-	tools_gui$(EXEEXT)
+	tools_cli$(EXEEXT)
 
 ifdef USE_FREETYPE
 TARGETS += \
 	create_sjisfnt$(EXEEXT)
 endif
 
+ifdef USE_WXWIDGETS
+TARGETS += \
+	tools_gui$(EXEEXT)
+endif
+
 UTILS := \
 	common/file.o \
 	common/md5.o \

Modified: tools/branches/gsoc2009-gui/configure
===================================================================
--- tools/branches/gsoc2009-gui/configure	2009-12-27 14:13:39 UTC (rev 46644)
+++ tools/branches/gsoc2009-gui/configure	2009-12-27 14:17:27 UTC (rev 46645)
@@ -75,6 +75,7 @@
 _mad=auto
 _zlib=auto
 _png=auto
+_wxwidgets=auto
 _freetype=auto
 _endian=unknown
 _need_memalign=no
@@ -311,6 +312,8 @@
 	--disable-zlib)           _zlib=no        ;;
 	--enable-png)             _png=yes        ;;
 	--disable-png)            _png=no         ;;
+	--enable-wxwidgets)       _wxsidgets=yes  ;;
+	--disable-wxwidgets)      _wxwidgets=no   ;;
 	--enable-freetype)        _freetype=yes   ;;
 	--disable-freetype)       _freetype=no    ;;
 	--enable-verbose-build)   _verbose_build=yes ;;
@@ -947,21 +950,32 @@
 echo "$freetype_version"
 
 #
-# Figure out installation directories
+# Check for wxWidgets
 #
-test -z "$_bindir" && _bindir="$_prefix/bin"
-test -z "$_mandir" && _mandir="$_prefix/share/man"
-test -z "$_libdir" && _libdir="$_prefix/lib"
+if test "$_wxwidgets" = auto ; then
+	_wxwidgets=no
+	find_wxconfig
+	if test -n "$_wxconfig"; then
+		_wxwidgets=yes
+	fi
+fi
 
-
-find_wxconfig
-if test -n "$_wxconfig"; then
+if test "$_wxwidgets" = yes ; then
 	_wxincludes="`$_wxconfig --prefix="$_wxpath" --cflags`"
 	_wxlibs="`$_wxconfig --prefix="$_wxpath" --libs`"
 fi
+add_to_config_mk_if_yes "$_wxwidgets" 'USE_WXWIDGETS = 1'
 
 
 #
+# Figure out installation directories
+#
+test -z "$_bindir" && _bindir="$_prefix/bin"
+test -z "$_mandir" && _mandir="$_prefix/share/man"
+test -z "$_libdir" && _libdir="$_prefix/lib"
+
+
+#
 # Do CXXFLAGS now we know the compiler version
 #
 if test "$have_gcc" = yes ; then


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