[Scummvm-cvs-logs] SF.net SVN: scummvm: [28094] scummex/branches/gsoc2007-gameresbrowser

zbychs at users.sourceforge.net zbychs at users.sourceforge.net
Sun Jul 15 07:18:41 CEST 2007 

Revision: 28094
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28094&view=rev
Author:   zbychs
Date:     2007-07-14 22:18:41 -0700 (Sat, 14 Jul 2007)

Log Message:
-----------
Fixed ./configure build.

Modified Paths:
--------------
    scummex/branches/gsoc2007-gameresbrowser/configure.ac
    scummex/branches/gsoc2007-gameresbrowser/globalDefines
    scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.am

Added Paths:
-----------
    scummex/branches/gsoc2007-gameresbrowser/README

Removed Paths:
-------------
    scummex/branches/gsoc2007-gameresbrowser/gcc/

Added: scummex/branches/gsoc2007-gameresbrowser/README
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/README	                        (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/README	2007-07-15 05:18:41 UTC (rev 28094)
@@ -0,0 +1,15 @@
+
+How to build the Game Resource Browser:
+----------------------------------------
+
+./configure
+make
+
+Configure accepts following options:
+--enable-debug        use debug version of wxWidgets, and compile with _DEBUG
+--enable-unicode      use unicode wxWidgets
+--with-wxversion=2.8  use this version of wxWidgets (2.8 is supported, others probably not)
+
+The executable is: src/browserapp/browserapp
+The Mac OS X bundle is: mac/GameResourceBrowser.app
+


Property changes on: scummex/branches/gsoc2007-gameresbrowser/README
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Modified: scummex/branches/gsoc2007-gameresbrowser/configure.ac
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/configure.ac	2007-07-15 04:20:22 UTC (rev 28093)
+++ scummex/branches/gsoc2007-gameresbrowser/configure.ac	2007-07-15 05:18:41 UTC (rev 28094)
@@ -4,15 +4,15 @@
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
 AC_ARG_ENABLE([debug],
-	[AS_HELP_STRING([--disable-debug],
-	[don't define _DEBUG during build])],
+	[AS_HELP_STRING([--enable-debug],
+	[link with debug version of wxWidgets])],
 [case "${enableval}" in
   yes) debug=true ;;
   no)  debug=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
-esac],[debug=true])
+esac],[debug=notset])
 AM_CONDITIONAL(DO_DEBUG, test x$debug = xtrue)
-#AM_CONDITIONAL(NO_DEBUG, test x$debug = xfalse)
+AM_CONDITIONAL(NO_DEBUG, test x$debug = xfalse)
 
 AC_ARG_ENABLE([unicode],
 	[AS_HELP_STRING([--enable-unicode],
@@ -25,16 +25,16 @@
 AM_CONDITIONAL(DO_UNICODE, test x$unicode = xtrue)
 AM_CONDITIONAL(NO_UNICODE, test x$unicode = xfalse)
 
-AC_ARG_ENABLE([wxdebug],
-	[AS_HELP_STRING([--enable-wxdebug],
-	[use debug version of wxWidgets])],
-[case "${enableval}" in
-  yes) wxdebug=true ;;
-  no)  wxdebug=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-wxdebug) ;;
-esac],[wxdebug=notset])
-AM_CONDITIONAL(DO_WXDEBUG, test x$wxdebug = xtrue)
-AM_CONDITIONAL(NO_WXDEBUG, test x$wxdebug = xfalse)
+#AC_ARG_ENABLE([wxdebug],
+#	[AS_HELP_STRING([--enable-wxdebug],
+#	[use debug version of wxWidgets])],
+#[case "${enableval}" in
+#  yes) wxdebug=true ;;
+#  no)  wxdebug=false ;;
+#  *) AC_MSG_ERROR(bad value ${enableval} for --enable-wxdebug) ;;
+#esac],[wxdebug=notset])
+#AM_CONDITIONAL(DO_WXDEBUG, test x$wxdebug = xtrue)
+#AM_CONDITIONAL(NO_WXDEBUG, test x$wxdebug = xfalse)
 
 AC_ARG_WITH([wxversion],
             [AS_HELP_STRING([--with-wxversion=2.8],

Modified: scummex/branches/gsoc2007-gameresbrowser/globalDefines
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/globalDefines	2007-07-15 04:20:22 UTC (rev 28093)
+++ scummex/branches/gsoc2007-gameresbrowser/globalDefines	2007-07-15 05:18:41 UTC (rev 28094)
@@ -1,19 +1,17 @@
 ###########################################################################################
 
-if DO_WXDEBUG
+if DO_DEBUG
     WX_DEBUG = --debug=yes
 endif
-if NO_WXDEBUG
+if NO_DEBUG
     WX_DEBUG = --debug=no
 endif
 
 if DO_UNICODE
     WX_UNICODE = --unicode=yes
-    UNICODE = _UNICODE
 endif
 if NO_UNICODE
     WX_UNICODE = --unicode=no
-    UNICODE = 
 endif
 
 WX_CONFIG = wx-config
@@ -26,11 +24,11 @@
 
 if DO_DEBUG
     TELL = DEBUG BUILD
-    GLOBAL_DEFINES = _DEBUG UNIX $(UNICODE)
+    GLOBAL_DEFINES = _DEBUG UNIX
 else
     TELL = RELEASE BUILD
 #    GLOBAL_DEFINES = NDEBUG UNIX $(UNICODE)
-    GLOBAL_DEFINES = UNIX $(UNICODE)
+    GLOBAL_DEFINES = UNIX
 endif
 
 ###########################################################################################

Modified: scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.am
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.am	2007-07-15 04:20:22 UTC (rev 28093)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.am	2007-07-15 05:18:41 UTC (rev 28094)
@@ -1,71 +1,73 @@
 include $(top_srcdir)/globalDefines
 
-#LDADD = ../core/libcore.a ../browser/libbrowser.a ../plugins/basic/libbasic.a ../plugins/scumm/libscumm.a \
-LDADD = \
-	../core/BObject.o \
-	../core/ObjectChain.o \
-	../core/ObjectRegistry.o \
-	../core/core.o \
-	../core/core_stdafx.o \
-	../core/guid.o \
-	../core/pinslot.o \
-	../core/rcobject.o \
-	../core/safe_static.o \
-	../core/tostring.o \
+#LDADD = ../core/libcore.a ../browser/libbrowser.a ../plugins/basic/libbasic.a ../plugins/scumm/libscumm.a
+#LDADD = 
+
+AM_LDFLAGS = $(WX_LIBS) \
+	$(builddir)/../core/BObject.o \
+	$(builddir)/../core/ObjectChain.o \
+	$(builddir)/../core/ObjectRegistry.o \
+	$(builddir)/../core/core.o \
+	$(builddir)/../core/core_stdafx.o \
+	$(builddir)/../core/guid.o \
+	$(builddir)/../core/pinslot.o \
+	$(builddir)/../core/rcobject.o \
+	$(builddir)/../core/safe_static.o \
+	$(builddir)/../core/tostring.o \
 	\
-	../browser/CoreFileTypes.o \
-	../browser/CoreInterfaces.o \
-	../browser/Directories.o \
-	../browser/ExplorationTree.o \
-	../browser/FileTypeRecognizer.o \
-	../browser/FileTypeRegistry.o \
-	../browser/GUIInterfaces.o \
-	../browser/PanelProvider.o \
-	../browser/PluginUtil.o \
-	../browser/VirtualNode.o \
-	../browser/browser.o \
-	../browser/browser_stdafx.o \
-	../browser/streams/simplefile.o \
-	../browser/streams/stream.o \
-	../browser/streams/wx2scstream.o \
-	../browser/streams/xorstream.o \
+	$(builddir)/../browser/CoreFileTypes.o \
+	$(builddir)/../browser/CoreInterfaces.o \
+	$(builddir)/../browser/Directories.o \
+	$(builddir)/../browser/ExplorationTree.o \
+	$(builddir)/../browser/FileTypeRecognizer.o \
+	$(builddir)/../browser/FileTypeRegistry.o \
+	$(builddir)/../browser/GUIInterfaces.o \
+	$(builddir)/../browser/PanelProvider.o \
+	$(builddir)/../browser/PluginUtil.o \
+	$(builddir)/../browser/VirtualNode.o \
+	$(builddir)/../browser/browser.o \
+	$(builddir)/../browser/browser_stdafx.o \
+	$(builddir)/../browser/simplefile.o \
+	$(builddir)/../browser/stream.o \
+	$(builddir)/../browser/wx2scstream.o \
+	$(builddir)/../browser/xorstream.o \
 	\
-	../plugins/basic/AuxInterfaces.o \
-	../plugins/basic/BasicParsers.o \
-	../plugins/basic/BitmapPanel.o \
-	../plugins/basic/DirectoryPresenter.o \
-	../plugins/basic/DiskFileProvider.o \
-	../plugins/basic/FileInfoPresenter.o \
-	../plugins/basic/HtmlPresenter.o \
-	../plugins/basic/ImagePresenter.o \
-	../plugins/basic/TextPresenter.o \
-	../plugins/basic/IconPresenter.o \
-	../plugins/basic/basic_plugin.o \
-	../plugins/basic/basic_stdafx.o \
+	$(builddir)/../plugins/basic/AuxInterfaces.o \
+	$(builddir)/../plugins/basic/BasicParsers.o \
+	$(builddir)/../plugins/basic/BitmapPanel.o \
+	$(builddir)/../plugins/basic/DirectoryPresenter.o \
+	$(builddir)/../plugins/basic/DiskFileProvider.o \
+	$(builddir)/../plugins/basic/FileInfoPresenter.o \
+	$(builddir)/../plugins/basic/HtmlPresenter.o \
+	$(builddir)/../plugins/basic/ImagePresenter.o \
+	$(builddir)/../plugins/basic/TextPresenter.o \
+	$(builddir)/../plugins/basic/IconPresenter.o \
+	$(builddir)/../plugins/basic/basic_plugin.o \
+	$(builddir)/../plugins/basic/basic_stdafx.o \
 	\
-	../plugins/scumm/BlockyBlockPresenter.o \
-	../plugins/scumm/ScummBlock.o \
-	../plugins/scumm/ScummBlockFactory.o \
-	../plugins/scumm/ScummBlockPresenter.o \
-	../plugins/scumm/ScummPresenterBase.o \
-	../plugins/scumm/ScummCommonPresenters.o \
-	../plugins/scumm/ScummSpecificPresenters.o \
-	../plugins/scumm/ScummSpecificPresenters2.o \
-	../plugins/scumm/ScummFileTypes.o \
-	../plugins/scumm/ScummParser.o \
-	../plugins/scumm/ScummRecognizer.o \
-	../plugins/scumm/ScummResource.o \
-	../plugins/scumm/ScummTag.o \
-	../plugins/scumm/bomp.o \
-	../plugins/scumm/codec37.o \
-	../plugins/scumm/codec47.o \
-	../plugins/scumm/descumm.o \
-	../plugins/scumm/descumm6.o \
-	../plugins/scumm/scaler.o \
-	../plugins/scumm/scumm_plugin.o \
-	../plugins/scumm/scumm_stdafx.o
+	$(builddir)/../plugins/scumm/BlockyBlockPresenter.o \
+	$(builddir)/../plugins/scumm/ScummBlock.o \
+	$(builddir)/../plugins/scumm/ScummBlockFactory.o \
+	$(builddir)/../plugins/scumm/ScummBlockPresenter.o \
+	$(builddir)/../plugins/scumm/ScummPresenterBase.o \
+	$(builddir)/../plugins/scumm/ScummCommonPresenters.o \
+	$(builddir)/../plugins/scumm/ScummSpecificPresenters.o \
+	$(builddir)/../plugins/scumm/ScummSpecificPresenters2.o \
+	$(builddir)/../plugins/scumm/ScummFileTypes.o \
+	$(builddir)/../plugins/scumm/ScummParser.o \
+	$(builddir)/../plugins/scumm/ScummRecognizer.o \
+	$(builddir)/../plugins/scumm/ScummResource.o \
+	$(builddir)/../plugins/scumm/ScummTag.o \
+	$(builddir)/../plugins/scumm/bomp.o \
+	$(builddir)/../plugins/scumm/codec37.o \
+	$(builddir)/../plugins/scumm/codec47.o \
+	$(builddir)/../plugins/scumm/descumm.o \
+	$(builddir)/../plugins/scumm/descumm6.o \
+	$(builddir)/../plugins/scumm/scaler.o \
+	$(builddir)/../plugins/scumm/scumm_plugin.o \
+	$(builddir)/../plugins/scumm/scumm_stdafx.o
 
-bin_LDFLAGS = $(WX_LIBS)
+
 bin_PROGRAMS = browserapp
 browserapp_SOURCES = \
 	BrowserApp.cpp \


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