[Scummvm-cvs-logs] SF.net SVN: scummvm:[52869] scummvm/branches/branch-1-2-0/configure
djwillis at users.sourceforge.net
djwillis at users.sourceforge.net
Thu Sep 23 23:24:33 CEST 2010
Revision: 52869
http://scummvm.svn.sourceforge.net/scummvm/?rev=52869&view=rev
Author: djwillis
Date: 2010-09-23 21:24:33 +0000 (Thu, 23 Sep 2010)
Log Message:
-----------
CONFIGURE: Backport: Rework GP2X/Wiz/Caanoo and OpenPandora builds.
Just some small cleanup to make the building of debug and
release builds follow the convention expected from the
configure flags.
Modified Paths:
--------------
scummvm/branches/branch-1-2-0/configure
Modified: scummvm/branches/branch-1-2-0/configure
===================================================================
--- scummvm/branches/branch-1-2-0/configure 2010-09-23 21:03:20 UTC (rev 52868)
+++ scummvm/branches/branch-1-2-0/configure 2010-09-23 21:24:33 UTC (rev 52869)
@@ -939,9 +939,18 @@
_host_cpu=arm
;;
caanoo)
- _host_os=caanoo-linux
+ _host_os=gph-linux
_host_cpu=arm
_host_alias=arm-none-linux-gnueabi
+ if test "$_debug_build" = auto; then
+ # If you want to debug on the Caanoo use '--disable-release --enable-debug'
+ _debug_build=no
+ fi
+
+ if test "$_release_build" = auto; then
+ # Enable release build by default.
+ _release_build=yes
+ fi
;;
dingux)
_host_os=linux
@@ -966,14 +975,32 @@
_host_alias=powerpc-gekko
;;
gp2x)
- _host_os=gp2x-linux
+ _host_os=gph-linux
_host_cpu=arm
_host_alias=arm-open2x-linux
+ if test "$_debug_build" = auto; then
+ # If you want to debug on the GP2X use '--disable-release --enable-debug'
+ _debug_build=no
+ fi
+
+ if test "$_release_build" = auto; then
+ # Enable release build by default.
+ _release_build=yes
+ fi
;;
gp2xwiz)
- _host_os=gp2xwiz-linux
+ _host_os=gph-linux
_host_cpu=arm
_host_alias=arm-open2x-linux
+ if test "$_debug_build" = auto; then
+ # If you want to debug on the GP2XWiz use '--disable-release --enable-debug'
+ _debug_build=no
+ fi
+
+ if test "$_release_build" = auto; then
+ # Enable release build by default.
+ _release_build=yes
+ fi
;;
i586-mingw32msvc)
_host_os=mingw32msvc
@@ -1008,9 +1035,18 @@
_host_cpu=arm
;;
openpandora)
- _host_os=openpandora-linux
+ _host_os=linux
_host_cpu=arm
_host_alias=arm-angstrom-linux-gnueabi
+ if test "$_debug_build" = auto; then
+ # If you want to debug on the OP use '--disable-release --enable-debug'
+ _debug_build=no
+ fi
+
+ if test "$_release_build" = auto; then
+ # Enable release build by default.
+ _release_build=yes
+ fi
;;
ppc-amigaos)
_host_os=amigaos
@@ -1555,7 +1591,15 @@
_need_memalign=yes
;;
caanoo)
- DEFINES="$DEFINES -DCAANOO -DNDEBUG"
+ DEFINES="$DEFINES -DCAANOO -DREDUCE_MEMORY_USAGE"
+ # Disable DOSBOX OPL for now.
+ DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+ if test "$_debug_build" = yes; then
+ DEFINES="$DEFINES -DGPH_DEBUG"
+ else
+ # Use -O3 on the Caanoo for non-debug builds.
+ CXXFLAGS="$CXXFLAGS -O3"
+ fi
CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
ASFLAGS="$ASFLAGS"
_unix=yes
@@ -1638,7 +1682,12 @@
add_line_to_config_h "#define USE_WII_DI"
;;
gp2x)
- DEFINES="$DEFINES -DGP2X -DNDEBUG"
+ DEFINES="$DEFINES -DGP2X -DREDUCE_MEMORY_USAGE"
+ # Disable DOSBOX OPL for now.
+ DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+ if test "$_debug_build" = yes; then
+ DEFINES="$DEFINES -DGPH_DEBUG"
+ fi
CXXFLAGS="$CXXFLAGS -march=armv4t"
ASFLAGS="$ASFLAGS -mfloat-abi=soft"
LDFLAGS="$LDFLAGS -static"
@@ -1657,7 +1706,12 @@
_port_mk="backends/platform/gp2x/gp2x-bundle.mk"
;;
gp2xwiz)
- DEFINES="$DEFINES -DGP2XWIZ -DNDEBUG"
+ DEFINES="$DEFINES -DGP2XWIZ -DREDUCE_MEMORY_USAGE"
+ # Disable DOSBOX OPL for now.
+ DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+ if test "$_debug_build" = yes; then
+ DEFINES="$DEFINES -DGPH_DEBUG"
+ fi
CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
ASFLAGS="$ASFLAGS -mfloat-abi=soft"
_unix=yes
@@ -1769,7 +1823,15 @@
_mt32emu=no
;;
openpandora)
- DEFINES="$DEFINES -DOPENPANDORA -DNDEBUG"
+ DEFINES="$DEFINES -DOPENPANDORA -DREDUCE_MEMORY_USAGE"
+ # Disable DOSBOX OPL for now.
+ DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+ if test "$_release_build" = no; then
+ DEFINES="$DEFINES -DOP_DEBUG"
+ else
+ # Use -O3 on the OpenPandora for non-debug builds.
+ CXXFLAGS="$CXXFLAGS -O3"
+ fi
CXXFLAGS="$CXXFLAGS -march=armv7-a -mtune=cortex-a8 -mfpu=neon"
ASFLAGS="$ASFLAGS -mfloat-abi=soft"
_unix=yes
@@ -2034,7 +2096,7 @@
POST_OBJS_FLAGS := -Wl,-no-whole-archive
'
;;
- gp2x* | gp2xwiz* | caanoo* | openpandora*)
+ gph*)
_def_plugin='
#define PLUGIN_PREFIX ""
#define PLUGIN_SUFFIX ".plugin"
@@ -2620,7 +2682,7 @@
find_sdlconfig
INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
- LDFLAGS="$LDFLAGS -static"
+ LDFLAGS="$LDFLAGS"
;;
gph)
find_sdlconfig
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