[Scummvm-cvs-logs] SF.net SVN: scummvm: [28100] scummex/branches/gsoc2007-gameresbrowser
zbychs at users.sourceforge.net
zbychs at users.sourceforge.net
Sun Jul 15 15:33:38 CEST 2007
Revision: 28100
http://scummvm.svn.sourceforge.net/scummvm/?rev=28100&view=rev
Author: zbychs
Date: 2007-07-15 06:33:37 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
Added proper wxWidgets check in configure.
Modified Paths:
--------------
scummex/branches/gsoc2007-gameresbrowser/Makefile.in
scummex/branches/gsoc2007-gameresbrowser/README
scummex/branches/gsoc2007-gameresbrowser/configure
scummex/branches/gsoc2007-gameresbrowser/configure.ac
scummex/branches/gsoc2007-gameresbrowser/globalDefines
scummex/branches/gsoc2007-gameresbrowser/mac/Makefile.in
scummex/branches/gsoc2007-gameresbrowser/src/Makefile.in
scummex/branches/gsoc2007-gameresbrowser/src/browser/Makefile.in
scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in
scummex/branches/gsoc2007-gameresbrowser/src/core/Makefile.in
scummex/branches/gsoc2007-gameresbrowser/src/plugins/Makefile.in
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/Makefile.in
Modified: scummex/branches/gsoc2007-gameresbrowser/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/Makefile.in 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/Makefile.in 2007-07-15 13:33:37 UTC (rev 28100)
@@ -30,7 +30,7 @@
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure build-aux/depcomp build-aux/install-sh \
build-aux/missing
@@ -109,6 +109,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WX_CONFIG = @WX_CONFIG@
+WX_VERSION_OPT = @WX_VERSION_OPT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
Modified: scummex/branches/gsoc2007-gameresbrowser/README
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/README 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/README 2007-07-15 13:33:37 UTC (rev 28100)
@@ -13,3 +13,5 @@
The executable is: src/browserapp/browserapp
The Mac OS X bundle is: mac/GameResourceBrowser.app
+Make sure there are no old .o objects in the original source tree when
+compiling. I've had troubles if there were any.
Modified: scummex/branches/gsoc2007-gameresbrowser/configure
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/configure 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/configure 2007-07-15 13:33:37 UTC (rev 28100)
@@ -639,8 +639,14 @@
am__untar
DO_DEBUG_TRUE
DO_DEBUG_FALSE
+NO_DEBUG_TRUE
+NO_DEBUG_FALSE
DO_UNICODE_TRUE
DO_UNICODE_FALSE
+NO_UNICODE_TRUE
+NO_UNICODE_FALSE
+WX_VERSION_OPT
+WX_CONFIG
CXX
CXXFLAGS
LDFLAGS
@@ -1245,11 +1251,16 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-debug Turn on debugging
- --disable-unicode Turn off unicode
+ --enable-debug link with debug version of wxWidgets
+ --enable-unicode turn on unicode
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-wxversion=2.8 give a specific wxWidgets version
+
Some influential environment variables:
CXX C++ compiler command
CXXFLAGS C++ compiler flags
@@ -2185,7 +2196,7 @@
{ (exit 1); exit 1; }; } ;;
esac
else
- debug=false
+ debug=notset
fi
if test x$debug = xtrue; then
@@ -2196,7 +2207,15 @@
DO_DEBUG_FALSE=
fi
+ if test x$debug = xfalse; then
+ NO_DEBUG_TRUE=
+ NO_DEBUG_FALSE='#'
+else
+ NO_DEBUG_TRUE='#'
+ NO_DEBUG_FALSE=
+fi
+
# Check whether --enable-unicode was given.
if test "${enable_unicode+set}" = set; then
enableval=$enable_unicode; case "${enableval}" in
@@ -2207,7 +2226,7 @@
{ (exit 1); exit 1; }; } ;;
esac
else
- unicode=true
+ unicode=notset
fi
if test x$unicode = xtrue; then
@@ -2218,8 +2237,89 @@
DO_UNICODE_FALSE=
fi
+ if test x$unicode = xfalse; then
+ NO_UNICODE_TRUE=
+ NO_UNICODE_FALSE='#'
+else
+ NO_UNICODE_TRUE='#'
+ NO_UNICODE_FALSE=
+fi
+#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)
+
+
+# Check whether --with-wxversion was given.
+if test "${with_wxversion+set}" = set; then
+ withval=$with_wxversion;
+else
+ with_wxversion=notset
+fi
+
+
+if test "x$with_wxversion" != xnotset; then
+ WX_VERSION_OPT="--version=$with_wxversion"
+
+fi
+
+
+# Extract the first word of "wx-config", so it can be a program name with args.
+set dummy wx-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_WX_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $WX_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_WX_CONFIG="$WX_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/local/bin "
+for as_dir in $as_dummy
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_WX_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_WX_CONFIG" && ac_cv_path_WX_CONFIG="no"
+ ;;
+esac
+fi
+WX_CONFIG=$ac_cv_path_WX_CONFIG
+if test -n "$WX_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $WX_CONFIG" >&5
+echo "${ECHO_T}$WX_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if [ "$WX_CONFIG" = "no" ] ; then
+ { { echo "$as_me:$LINENO: error: \"Could not find wx-config: is wxWindows installed? is wx-config in your path?\"" >&5
+echo "$as_me: error: \"Could not find wx-config: is wxWindows installed? is wx-config in your path?\"" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3200,6 +3300,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${NO_DEBUG_TRUE}" && test -z "${NO_DEBUG_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"NO_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"NO_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${DO_UNICODE_TRUE}" && test -z "${DO_UNICODE_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"DO_UNICODE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -3207,6 +3314,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${NO_UNICODE_TRUE}" && test -z "${NO_UNICODE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"NO_UNICODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"NO_UNICODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -3822,8 +3936,14 @@
am__untar!$am__untar$ac_delim
DO_DEBUG_TRUE!$DO_DEBUG_TRUE$ac_delim
DO_DEBUG_FALSE!$DO_DEBUG_FALSE$ac_delim
+NO_DEBUG_TRUE!$NO_DEBUG_TRUE$ac_delim
+NO_DEBUG_FALSE!$NO_DEBUG_FALSE$ac_delim
DO_UNICODE_TRUE!$DO_UNICODE_TRUE$ac_delim
DO_UNICODE_FALSE!$DO_UNICODE_FALSE$ac_delim
+NO_UNICODE_TRUE!$NO_UNICODE_TRUE$ac_delim
+NO_UNICODE_FALSE!$NO_UNICODE_FALSE$ac_delim
+WX_VERSION_OPT!$WX_VERSION_OPT$ac_delim
+WX_CONFIG!$WX_CONFIG$ac_delim
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -3845,7 +3965,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: scummex/branches/gsoc2007-gameresbrowser/configure.ac
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/configure.ac 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/configure.ac 2007-07-15 13:33:37 UTC (rev 28100)
@@ -46,6 +46,12 @@
[AC_SUBST([WX_VERSION_OPT], ["--version=$with_wxversion"])],
[])
+dnl wxWindows -- we assume that if wx-config is found, wxWindows is successfully installed.
+AC_PATH_PROG(WX_CONFIG, wx-config, no, $PATH:/usr/local/bin )
+if [[ "$WX_CONFIG" = "no" ]] ; then
+ AC_MSG_ERROR("Could not find wx-config: is wxWindows installed? is wx-config in your path?")
+fi
+
AC_PROG_CXX
AC_PROG_RANLIB
AC_CONFIG_HEADERS([config.h])
Modified: scummex/branches/gsoc2007-gameresbrowser/globalDefines
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/globalDefines 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/globalDefines 2007-07-15 13:33:37 UTC (rev 28100)
@@ -14,7 +14,7 @@
WX_UNICODE = --unicode=no
endif
-WX_CONFIG = wx-config
+#WX_CONFIG = wx-config
#WX_CONFIG = /usr/bin/wx-config
WX_OPTS = $(WX_VERSION_OPT) $(WX_DEBUG) $(WX_UNICODE)
WX_FLAGS = $(shell $(WX_CONFIG) $(WX_OPTS) --cxxflags)
Modified: scummex/branches/gsoc2007-gameresbrowser/mac/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/mac/Makefile.in 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/mac/Makefile.in 2007-07-15 13:33:37 UTC (rev 28100)
@@ -86,6 +86,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WX_CONFIG = @WX_CONFIG@
+WX_VERSION_OPT = @WX_VERSION_OPT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
Modified: scummex/branches/gsoc2007-gameresbrowser/src/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/Makefile.in 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/src/Makefile.in 2007-07-15 13:33:37 UTC (rev 28100)
@@ -105,6 +105,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WX_CONFIG = @WX_CONFIG@
+WX_VERSION_OPT = @WX_VERSION_OPT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browser/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browser/Makefile.in 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browser/Makefile.in 2007-07-15 13:33:37 UTC (rev 28100)
@@ -114,6 +114,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WX_CONFIG = @WX_CONFIG@
+WX_VERSION_OPT = @WX_VERSION_OPT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -155,19 +157,14 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
- at DO_DEBUG_FALSE@WX_DEBUG = no
- at DO_DEBUG_TRUE@WX_DEBUG = yes
- at DO_UNICODE_FALSE@WX_UNICODE = no
+ at DO_DEBUG_TRUE@WX_DEBUG = --debug=yes
+ at NO_DEBUG_TRUE@WX_DEBUG = --debug=no
+ at DO_UNICODE_TRUE@WX_UNICODE = --unicode=yes
+ at NO_UNICODE_TRUE@WX_UNICODE = --unicode=no
-#below defining or not defining _UNICODE is only for sanity
-#wxWidgets redefines _UNICODE anyway
- at DO_UNICODE_TRUE@WX_UNICODE = yes
- at DO_UNICODE_FALSE@UNICODE =
- at DO_UNICODE_TRUE@UNICODE = _UNICODE
-WX_VERSION = 2.8
-WX_CONFIG = wx-config
+#WX_CONFIG = wx-config
#WX_CONFIG = /usr/bin/wx-config
-WX_OPTS = --version=$(WX_VERSION) --debug=$(WX_DEBUG) --unicode=$(WX_UNICODE)
+WX_OPTS = $(WX_VERSION_OPT) $(WX_DEBUG) $(WX_UNICODE)
WX_FLAGS = $(shell $(WX_CONFIG) $(WX_OPTS) --cxxflags)
WX_LIBS = $(shell $(WX_CONFIG) $(WX_OPTS) --libs)
@DO_DEBUG_FALSE at TELL = RELEASE BUILD
@@ -175,11 +172,13 @@
###########################################################################################
@DO_DEBUG_TRUE at TELL = DEBUG BUILD
# GLOBAL_DEFINES = NDEBUG UNIX $(UNICODE)
- at DO_DEBUG_FALSE@GLOBAL_DEFINES = UNIX $(UNICODE)
- at DO_DEBUG_TRUE@GLOBAL_DEFINES = _DEBUG UNIX $(UNICODE)
+ at DO_DEBUG_FALSE@GLOBAL_DEFINES = UNIX
+ at DO_DEBUG_TRUE@GLOBAL_DEFINES = _DEBUG UNIX
###########################################################################################
-BASE_FLAGS = -g -Wall -fno-strict-aliasing $(patsubst %, -D%, $(GLOBAL_DEFINES) )
+
+#-Wall -fno-strict-aliasing
+BASE_FLAGS = -g $(patsubst %, -D%, $(GLOBAL_DEFINES) )
AM_CXXFLAGS = $(BASE_FLAGS) $(WX_FLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/browser -I$(top_srcdir)/src/plugins -I$(top_srcdir)/src/plugins/basic -I$(top_srcdir)/src/plugins/scumm
noinst_LIBRARIES = libbrowser.a
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in 2007-07-15 13:33:37 UTC (rev 28100)
@@ -51,10 +51,6 @@
browserapp_stdafx.$(OBJEXT) guicon.$(OBJEXT)
browserapp_OBJECTS = $(am_browserapp_OBJECTS)
browserapp_LDADD = $(LDADD)
-browserapp_DEPENDENCIES = ../core/libcore.a ../browser/libbrowser.a \
- ../plugins/basic/libbasic.a ../plugins/scumm/libscumm.a \
- ../browser/wx2scstream.o ../core/tostring.o \
- ../browser/xorstream.o ../browser/GUIInterfaces.o
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
@@ -113,6 +109,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WX_CONFIG = @WX_CONFIG@
+WX_VERSION_OPT = @WX_VERSION_OPT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -154,19 +152,14 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
- at DO_DEBUG_FALSE@WX_DEBUG = no
- at DO_DEBUG_TRUE@WX_DEBUG = yes
- at DO_UNICODE_FALSE@WX_UNICODE = no
+ at DO_DEBUG_TRUE@WX_DEBUG = --debug=yes
+ at NO_DEBUG_TRUE@WX_DEBUG = --debug=no
+ at DO_UNICODE_TRUE@WX_UNICODE = --unicode=yes
+ at NO_UNICODE_TRUE@WX_UNICODE = --unicode=no
-#below defining or not defining _UNICODE is only for sanity
-#wxWidgets redefines _UNICODE anyway
- at DO_UNICODE_TRUE@WX_UNICODE = yes
- at DO_UNICODE_FALSE@UNICODE =
- at DO_UNICODE_TRUE@UNICODE = _UNICODE
-WX_VERSION = 2.8
-WX_CONFIG = wx-config
+#WX_CONFIG = wx-config
#WX_CONFIG = /usr/bin/wx-config
-WX_OPTS = --version=$(WX_VERSION) --debug=$(WX_DEBUG) --unicode=$(WX_UNICODE)
+WX_OPTS = $(WX_VERSION_OPT) $(WX_DEBUG) $(WX_UNICODE)
WX_FLAGS = $(shell $(WX_CONFIG) $(WX_OPTS) --cxxflags)
WX_LIBS = $(shell $(WX_CONFIG) $(WX_OPTS) --libs)
@DO_DEBUG_FALSE at TELL = RELEASE BUILD
@@ -174,17 +167,82 @@
###########################################################################################
@DO_DEBUG_TRUE at TELL = DEBUG BUILD
# GLOBAL_DEFINES = NDEBUG UNIX $(UNICODE)
- at DO_DEBUG_FALSE@GLOBAL_DEFINES = UNIX $(UNICODE)
- at DO_DEBUG_TRUE@GLOBAL_DEFINES = _DEBUG UNIX $(UNICODE)
+ at DO_DEBUG_FALSE@GLOBAL_DEFINES = UNIX
+ at DO_DEBUG_TRUE@GLOBAL_DEFINES = _DEBUG UNIX
###########################################################################################
-BASE_FLAGS = -g -Wall -fno-strict-aliasing $(patsubst %, -D%, $(GLOBAL_DEFINES) )
+
+#-Wall -fno-strict-aliasing
+BASE_FLAGS = -g $(patsubst %, -D%, $(GLOBAL_DEFINES) )
AM_CXXFLAGS = $(BASE_FLAGS) $(WX_FLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/browser -I$(top_srcdir)/src/plugins -I$(top_srcdir)/src/plugins/basic -I$(top_srcdir)/src/plugins/scumm
-LDADD = ../core/libcore.a ../browser/libbrowser.a ../plugins/basic/libbasic.a ../plugins/scumm/libscumm.a \
- ../browser/wx2scstream.o ../core/tostring.o ../browser/xorstream.o ../browser/GUIInterfaces.o
-AM_LDFLAGS = $(WX_LIBS)
+#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 \
+ \
+ $(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 \
+ \
+ $(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 \
+ \
+ $(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
+
browserapp_SOURCES = \
BrowserApp.cpp \
BrowserApp.h \
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/Makefile.in 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/Makefile.in 2007-07-15 13:33:37 UTC (rev 28100)
@@ -120,6 +120,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WX_CONFIG = @WX_CONFIG@
+WX_VERSION_OPT = @WX_VERSION_OPT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -161,19 +163,14 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
- at DO_DEBUG_FALSE@WX_DEBUG = no
- at DO_DEBUG_TRUE@WX_DEBUG = yes
- at DO_UNICODE_FALSE@WX_UNICODE = no
+ at DO_DEBUG_TRUE@WX_DEBUG = --debug=yes
+ at NO_DEBUG_TRUE@WX_DEBUG = --debug=no
+ at DO_UNICODE_TRUE@WX_UNICODE = --unicode=yes
+ at NO_UNICODE_TRUE@WX_UNICODE = --unicode=no
-#below defining or not defining _UNICODE is only for sanity
-#wxWidgets redefines _UNICODE anyway
- at DO_UNICODE_TRUE@WX_UNICODE = yes
- at DO_UNICODE_FALSE@UNICODE =
- at DO_UNICODE_TRUE@UNICODE = _UNICODE
-WX_VERSION = 2.8
-WX_CONFIG = wx-config
+#WX_CONFIG = wx-config
#WX_CONFIG = /usr/bin/wx-config
-WX_OPTS = --version=$(WX_VERSION) --debug=$(WX_DEBUG) --unicode=$(WX_UNICODE)
+WX_OPTS = $(WX_VERSION_OPT) $(WX_DEBUG) $(WX_UNICODE)
WX_FLAGS = $(shell $(WX_CONFIG) $(WX_OPTS) --cxxflags)
WX_LIBS = $(shell $(WX_CONFIG) $(WX_OPTS) --libs)
@DO_DEBUG_FALSE at TELL = RELEASE BUILD
@@ -181,11 +178,13 @@
###########################################################################################
@DO_DEBUG_TRUE at TELL = DEBUG BUILD
# GLOBAL_DEFINES = NDEBUG UNIX $(UNICODE)
- at DO_DEBUG_FALSE@GLOBAL_DEFINES = UNIX $(UNICODE)
- at DO_DEBUG_TRUE@GLOBAL_DEFINES = _DEBUG UNIX $(UNICODE)
+ at DO_DEBUG_FALSE@GLOBAL_DEFINES = UNIX
+ at DO_DEBUG_TRUE@GLOBAL_DEFINES = _DEBUG UNIX
###########################################################################################
-BASE_FLAGS = -g -Wall -fno-strict-aliasing $(patsubst %, -D%, $(GLOBAL_DEFINES) )
+
+#-Wall -fno-strict-aliasing
+BASE_FLAGS = -g $(patsubst %, -D%, $(GLOBAL_DEFINES) )
AM_CXXFLAGS = $(BASE_FLAGS) $(WX_FLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/browser -I$(top_srcdir)/src/plugins -I$(top_srcdir)/src/plugins/basic -I$(top_srcdir)/src/plugins/scumm
noinst_LIBRARIES = libcore.a
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/Makefile.in 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/Makefile.in 2007-07-15 13:33:37 UTC (rev 28100)
@@ -105,6 +105,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WX_CONFIG = @WX_CONFIG@
+WX_VERSION_OPT = @WX_VERSION_OPT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in 2007-07-15 13:33:37 UTC (rev 28100)
@@ -122,6 +122,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WX_CONFIG = @WX_CONFIG@
+WX_VERSION_OPT = @WX_VERSION_OPT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -163,19 +165,14 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
- at DO_DEBUG_FALSE@WX_DEBUG = no
- at DO_DEBUG_TRUE@WX_DEBUG = yes
- at DO_UNICODE_FALSE@WX_UNICODE = no
+ at DO_DEBUG_TRUE@WX_DEBUG = --debug=yes
+ at NO_DEBUG_TRUE@WX_DEBUG = --debug=no
+ at DO_UNICODE_TRUE@WX_UNICODE = --unicode=yes
+ at NO_UNICODE_TRUE@WX_UNICODE = --unicode=no
-#below defining or not defining _UNICODE is only for sanity
-#wxWidgets redefines _UNICODE anyway
- at DO_UNICODE_TRUE@WX_UNICODE = yes
- at DO_UNICODE_FALSE@UNICODE =
- at DO_UNICODE_TRUE@UNICODE = _UNICODE
-WX_VERSION = 2.8
-WX_CONFIG = wx-config
+#WX_CONFIG = wx-config
#WX_CONFIG = /usr/bin/wx-config
-WX_OPTS = --version=$(WX_VERSION) --debug=$(WX_DEBUG) --unicode=$(WX_UNICODE)
+WX_OPTS = $(WX_VERSION_OPT) $(WX_DEBUG) $(WX_UNICODE)
WX_FLAGS = $(shell $(WX_CONFIG) $(WX_OPTS) --cxxflags)
WX_LIBS = $(shell $(WX_CONFIG) $(WX_OPTS) --libs)
@DO_DEBUG_FALSE at TELL = RELEASE BUILD
@@ -183,11 +180,13 @@
###########################################################################################
@DO_DEBUG_TRUE at TELL = DEBUG BUILD
# GLOBAL_DEFINES = NDEBUG UNIX $(UNICODE)
- at DO_DEBUG_FALSE@GLOBAL_DEFINES = UNIX $(UNICODE)
- at DO_DEBUG_TRUE@GLOBAL_DEFINES = _DEBUG UNIX $(UNICODE)
+ at DO_DEBUG_FALSE@GLOBAL_DEFINES = UNIX
+ at DO_DEBUG_TRUE@GLOBAL_DEFINES = _DEBUG UNIX
###########################################################################################
-BASE_FLAGS = -g -Wall -fno-strict-aliasing $(patsubst %, -D%, $(GLOBAL_DEFINES) )
+
+#-Wall -fno-strict-aliasing
+BASE_FLAGS = -g $(patsubst %, -D%, $(GLOBAL_DEFINES) )
AM_CXXFLAGS = $(BASE_FLAGS) $(WX_FLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/browser -I$(top_srcdir)/src/plugins -I$(top_srcdir)/src/plugins/basic -I$(top_srcdir)/src/plugins/scumm
noinst_LIBRARIES = libbasic.a
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/Makefile.in 2007-07-15 12:47:31 UTC (rev 28099)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/Makefile.in 2007-07-15 13:33:37 UTC (rev 28100)
@@ -50,13 +50,15 @@
libscumm_a_LIBADD =
am_libscumm_a_OBJECTS = BlockyBlockPresenter.$(OBJEXT) \
ScummBlock.$(OBJEXT) ScummBlockFactory.$(OBJEXT) \
- ScummBlockInfoPresenter.$(OBJEXT) \
- ScummBlockPresenter.$(OBJEXT) ScummFileTypes.$(OBJEXT) \
- ScummImage.$(OBJEXT) ScummParser.$(OBJEXT) \
- ScummRecognizer.$(OBJEXT) ScummResource.$(OBJEXT) \
- ScummTag.$(OBJEXT) bomp.$(OBJEXT) codec37.$(OBJEXT) \
- codec47.$(OBJEXT) descumm.$(OBJEXT) descumm6.$(OBJEXT) \
- scaler.$(OBJEXT) scumm_plugin.$(OBJEXT) scumm_stdafx.$(OBJEXT)
+ ScummBlockPresenter.$(OBJEXT) ScummPresenterBase.$(OBJEXT) \
+ ScummCommonPresenters.$(OBJEXT) \
+ ScummSpecificPresenters.$(OBJEXT) \
+ ScummSpecificPresenters2.$(OBJEXT) ScummFileTypes.$(OBJEXT) \
+ ScummParser.$(OBJEXT) ScummRecognizer.$(OBJEXT) \
+ ScummResource.$(OBJEXT) ScummTag.$(OBJEXT) bomp.$(OBJEXT) \
+ codec37.$(OBJEXT) codec47.$(OBJEXT) descumm.$(OBJEXT) \
+ descumm6.$(OBJEXT) scaler.$(OBJEXT) scumm_plugin.$(OBJEXT) \
+ scumm_stdafx.$(OBJEXT)
libscumm_a_OBJECTS = $(am_libscumm_a_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
@@ -125,6 +127,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WX_CONFIG = @WX_CONFIG@
+WX_VERSION_OPT = @WX_VERSION_OPT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -166,19 +170,14 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
- at DO_DEBUG_FALSE@WX_DEBUG = no
- at DO_DEBUG_TRUE@WX_DEBUG = yes
- at DO_UNICODE_FALSE@WX_UNICODE = no
+ at DO_DEBUG_TRUE@WX_DEBUG = --debug=yes
+ at NO_DEBUG_TRUE@WX_DEBUG = --debug=no
+ at DO_UNICODE_TRUE@WX_UNICODE = --unicode=yes
+ at NO_UNICODE_TRUE@WX_UNICODE = --unicode=no
-#below defining or not defining _UNICODE is only for sanity
-#wxWidgets redefines _UNICODE anyway
- at DO_UNICODE_TRUE@WX_UNICODE = yes
- at DO_UNICODE_FALSE@UNICODE =
- at DO_UNICODE_TRUE@UNICODE = _UNICODE
-WX_VERSION = 2.8
-WX_CONFIG = wx-config
+#WX_CONFIG = wx-config
#WX_CONFIG = /usr/bin/wx-config
-WX_OPTS = --version=$(WX_VERSION) --debug=$(WX_DEBUG) --unicode=$(WX_UNICODE)
+WX_OPTS = $(WX_VERSION_OPT) $(WX_DEBUG) $(WX_UNICODE)
WX_FLAGS = $(shell $(WX_CONFIG) $(WX_OPTS) --cxxflags)
WX_LIBS = $(shell $(WX_CONFIG) $(WX_OPTS) --libs)
@DO_DEBUG_FALSE at TELL = RELEASE BUILD
@@ -186,11 +185,13 @@
###########################################################################################
@DO_DEBUG_TRUE at TELL = DEBUG BUILD
# GLOBAL_DEFINES = NDEBUG UNIX $(UNICODE)
- at DO_DEBUG_FALSE@GLOBAL_DEFINES = UNIX $(UNICODE)
- at DO_DEBUG_TRUE@GLOBAL_DEFINES = _DEBUG UNIX $(UNICODE)
+ at DO_DEBUG_FALSE@GLOBAL_DEFINES = UNIX
+ at DO_DEBUG_TRUE@GLOBAL_DEFINES = _DEBUG UNIX
###########################################################################################
-BASE_FLAGS = -g -Wall -fno-strict-aliasing $(patsubst %, -D%, $(GLOBAL_DEFINES) )
+
+#-Wall -fno-strict-aliasing
+BASE_FLAGS = -g $(patsubst %, -D%, $(GLOBAL_DEFINES) )
AM_CXXFLAGS = $(BASE_FLAGS) $(WX_FLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/browser -I$(top_srcdir)/src/plugins -I$(top_srcdir)/src/plugins/basic -I$(top_srcdir)/src/plugins/scumm
noinst_LIBRARIES = libscumm.a
@@ -202,13 +203,18 @@
ScummBlock.h \
ScummBlockFactory.cpp \
ScummBlockFactory.h \
- ScummBlockInfoPresenter.cpp \
- ScummBlockInfoPresenter.h \
ScummBlockPresenter.cpp \
ScummBlockPresenter.h \
+ ScummPresenterBase.cpp \
+ ScummPresenterBase.h \
+ ScummCommonPresenters.cpp \
+ ScummCommonPresenters.h \
+ ScummSpecificPresenters.cpp \
+ ScummSpecificPresenters.h \
+ ScummSpecificPresenters2.cpp \
+ ScummSpecificPresenters2.h \
ScummFileTypes.cpp \
ScummFileTypes.h \
- ScummImage.cpp \
ScummImageDetail.h \
ScummParser.cpp \
ScummParser.h \
@@ -286,13 +292,15 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/BlockyBlockPresenter.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummBlock.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummBlockFactory.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummBlockInfoPresenter.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummBlockPresenter.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummCommonPresenters.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummFileTypes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummImage.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummParser.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummPresenterBase.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummRecognizer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummResource.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummSpecificPresenters.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummSpecificPresenters2.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ScummTag.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bomp.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/codec37.Po at am__quote@
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