aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Willis2010-10-20 13:03:19 +0000
committerJohn Willis2010-10-20 13:03:19 +0000
commitf835d49e2ad6fdb310f0ca2a4a7e987f01baa136 (patch)
tree065599ed722064bb81ead5869e55703ac04c7644
parent4e936522eeb0de8092ad74e8522b885550d934cb (diff)
downloadscummvm-rg350-f835d49e2ad6fdb310f0ca2a4a7e987f01baa136.tar.gz
scummvm-rg350-f835d49e2ad6fdb310f0ca2a4a7e987f01baa136.tar.bz2
scummvm-rg350-f835d49e2ad6fdb310f0ca2a4a7e987f01baa136.zip
CONFIGURE: Add -DGPH_DEVICE to all the GPH device targets.
Also add wrapper around the plugin dir. for the OpenPandora from 1.2.0 branch. svn-id: r53640
-rwxr-xr-xconfigure26
1 files changed, 16 insertions, 10 deletions
diff --git a/configure b/configure
index 5053884c51..0814ad3545 100755
--- a/configure
+++ b/configure
@@ -676,7 +676,7 @@ Fine tuning of the installation directories:
Special configuration feature:
--host=HOST cross-compile to target HOST (arm-linux, ...)
special targets: android for Android
- caanoo for GP2X Caanoo
+ caanoo for Caanoo
dingux for Dingux
dreamcast for Sega Dreamcast
ds for Nintendo DS
@@ -1626,9 +1626,9 @@ if test -n "$_host"; then
_need_memalign=yes
;;
caanoo)
+ # This uses the GPH backend.
+ DEFINES="$DEFINES -DGPH_DEVICE"
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
@@ -1717,9 +1717,9 @@ if test -n "$_host"; then
add_line_to_config_h "#define USE_WII_DI"
;;
gp2x)
+ # This uses the GPH backend.
+ DEFINES="$DEFINES -DGPH_DEVICE"
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
@@ -1741,9 +1741,9 @@ if test -n "$_host"; then
_port_mk="backends/platform/gp2x/gp2x-bundle.mk"
;;
gp2xwiz)
+ # This uses the GPH backend.
+ DEFINES="$DEFINES -DGPH_DEVICE"
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
@@ -1861,8 +1861,6 @@ if test -n "$_host"; then
;;
openpandora)
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
@@ -2675,8 +2673,16 @@ test "x$prefix" = xNONE && prefix=/usr/local
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
DEFINES="$DEFINES -DDATA_PATH=\\\"$datadir\\\""
-DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir/scummvm\\\""
+case $_backend in
+ openpandora)
+ # Add ../plugins as a path so plugins can be found when running from a .PND.
+ DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"../plugins\\\""
+ ;;
+ *)
+ DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir/scummvm\\\""
+ ;;
+esac
#
# Set variables for profiling.