aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1241
1 files changed, 606 insertions, 635 deletions
diff --git a/configure b/configure
index 78141e4daa..355492e3c9 100755
--- a/configure
+++ b/configure
@@ -88,7 +88,7 @@ add_engine groovie "Groovie" yes "groovie2"
add_engine groovie2 "Groovie 2 games" no
add_engine hugo "Hugo Trilogy" yes
add_engine kyra "Legend of Kyrandia" yes "lol"
-add_engine lol "Lands of Lore" no
+add_engine lol "Lands of Lore" yes
add_engine lastexpress "The Last Express" no
add_engine lure "Lure of the Temptress" yes
add_engine m4 "M4/MADS" no
@@ -131,27 +131,23 @@ _alsa=auto
_seq_midi=auto
_timidity=auto
_zlib=auto
-_mpeg2=no
_png=auto
_theoradec=auto
+_faad=auto
_fluidsynth=auto
-_16bit=auto
_opengl=auto
_opengles=auto
_readline=auto
# Default option behaviour yes/no
_debug_build=auto
_release_build=auto
+_verbose_build=no
_text_console=no
_mt32emu=yes
_build_scalers=yes
_build_hq_scalers=yes
-_arm_asm=no
-_indeo3=auto
_enable_prof=no
-_unix=no
_global_constructors=no
-_elf_loader=no
# Default vkeybd/keymapper options
_vkeybd=no
_keymapper=no
@@ -159,12 +155,12 @@ _keymapper=no
_translation=yes
# Default platform settings
_backend=sdl
-_endian=unknown
-_need_memalign=no
-_have_x86=no
-_verbose_build=no
+_16bit=auto
_dynamic_modules=no
+_elf_loader=no
_plugins_default=static
+_plugin_prefix=
+_plugin_suffix=
_nasm=auto
# Default commands
_ranlib=ranlib
@@ -180,6 +176,15 @@ _sdlpath="$PATH"
_nasmpath="$PATH"
NASMFLAGS=""
NASM=""
+# The following variables are automatically detected, and should not
+# be modified otherwise. Consider them read-only.
+_posix=no
+_endian=unknown
+_need_memalign=yes
+_have_x86=no
+_arm_asm=no
+
+
# Directories for installing ScummVM.
# This list is closely based on what GNU autoconf does,
@@ -741,20 +746,18 @@ Optional Libraries:
--with-zlib-prefix=DIR Prefix where zlib is installed (optional)
--disable-zlib disable zlib (compression) support [autodetect]
- --with-mpeg2-prefix=DIR Prefix where libmpeg2 is installed (optional)
- --enable-mpeg2 enable mpeg2 codec for cutscenes [no]
-
--with-opengl-prefix=DIR Prefix where OpenGL (ES) is installed (optional)
--disable-opengl disable OpenGL (ES) support [autodetect]
- --disable-indeo3 disable Indeo3 decoder [autodetect]
-
--with-png-prefix=DIR Prefix where libpng is installed (optional)
--disable-png disable PNG decoder [autodetect]
--with-theoradec-prefix=DIR Prefix where libtheoradec is installed (optional)
--disable-theoradec disable Theora decoder [autodetect]
+ --with-faad-prefix=DIR Prefix where libfaad is installed (optional)
+ --disable-faad disable AAC decoder [autodetect]
+
--with-fluidsynth-prefix=DIR Prefix where libfluidsynth is
installed (optional)
--disable-fluidsynth disable fluidsynth MIDI driver [autodetect]
@@ -806,13 +809,12 @@ for ac_option in $@; do
--disable-zlib) _zlib=no ;;
--enable-nasm) _nasm=yes ;;
--disable-nasm) _nasm=no ;;
- --enable-mpeg2) _mpeg2=yes ;;
- --disable-indeo3) _indeo3=no ;;
- --enable-indeo3) _indeo3=yes ;;
--disable-png) _png=no ;;
--enable-png) _png=yes ;;
--disable-theoradec) _theoradec=no ;;
--enable-theoradec) _theoradec=yes ;;
+ --disable-faad) _faad=no ;;
+ --enable-faad) _faad=yes ;;
--disable-fluidsynth) _fluidsynth=no ;;
--enable-readline) _readline=yes ;;
--disable-readline) _readline=no ;;
@@ -836,11 +838,6 @@ for ac_option in $@; do
FLUIDSYNTH_CFLAGS="-I$arg/include"
FLUIDSYNTH_LIBS="-L$arg/lib"
;;
- --with-mpeg2-prefix=*)
- arg=`echo $ac_option | cut -d '=' -f 2`
- MPEG2_CFLAGS="-I$arg/include"
- MPEG2_LIBS="-L$arg/lib"
- ;;
--with-alsa-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2`
ALSA_CFLAGS="-I$arg/include"
@@ -881,6 +878,11 @@ for ac_option in $@; do
THEORADEC_CFLAGS="-I$arg/include"
THEORADEC_LIBS="-L$arg/lib"
;;
+ --with-faad-prefix=*)
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ FAAD_CFLAGS="-I$arg/include"
+ FAAD_LIBS="-L$arg/lib"
+ ;;
--with-zlib-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2`
ZLIB_CFLAGS="-I$arg/include"
@@ -991,15 +993,6 @@ caanoo)
_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
@@ -1027,29 +1020,11 @@ gp2x)
_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=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
@@ -1087,15 +1062,6 @@ openpandora)
_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
@@ -1105,28 +1071,11 @@ ps2)
_host_os=ps2
_host_cpu=mips64r5900el
_host_alias=ee
- if test "$_debug_build" = auto; then
- # Disable debug mode by default. The resulting binaries are far too big in general,
- # and one has to disable multiple engines to make it usable.
- _debug_build=no
- fi
-
- if test "$_release_build" = auto; then
- # Enable release build by default.
- _release_build=yes
- fi
;;
psp)
_host_os=psp
_host_cpu=mipsallegrexel
_host_alias=psp
- if test -z "$PSPDEV"; then
- PSPDEV=`psp-config --pspdev-path`
- fi
- if test -d "$PSPDEV/psp/lib"; then
- LDFLAGS="$LDFLAGS -L$PSPDEV/psp/lib"
- fi
- LDFLAGS="$LDFLAGS -L$PSPDEV/psp/sdk/lib -specs=$_srcdir/backends/platform/psp/psp.spec"
;;
samsungtv)
_host_os=linux
@@ -1183,6 +1132,20 @@ fi
# Determine extra build flags for debug and/or release builds
#
+case $_host in
+caanoo | gp2x | gp2xwiz | openpandora | ps2)
+ if test "$_debug_build" = auto; then
+ # If you want to debug one of these platforms, use '--disable-release --enable-debug'
+ _debug_build=no
+ fi
+
+ if test "$_release_build" = auto; then
+ # Enable release build by default.
+ _release_build=yes
+ fi
+ ;;
+esac
+
if test "$_debug_build" != no; then
# debug mode not explicitly disabled -> compile with -g
CXXFLAGS="$CXXFLAGS -g"
@@ -1193,7 +1156,9 @@ if test "$_release_build" = yes; then
# makes it possible to use -Wuninitialized, so let's do that.
# We will also add a define, which indicates we are doing
# an build for a release version.
- CXXFLAGS="$CXXFLAGS -O2 -Wuninitialized -DRELEASE_BUILD"
+ CXXFLAGS="$CXXFLAGS -O2"
+ CXXFLAGS="$CXXFLAGS -Wuninitialized"
+ DEFINES="$DEFINES -DRELEASE_BUILD"
fi
@@ -1249,9 +1214,15 @@ ps2)
fi
;;
psp)
- PSPSDK=`psp-config --pspsdk-path`
+ if test -z "$PSPDEV"; then
+ PSPDEV=`psp-config --pspdev-path`
+ fi
+ # TODO: Should we also insist on a valid PSPDEV value?
+ if test -z "$PSPSDK"; then
+ PSPSDK=`psp-config --pspsdk-path`
+ fi
if test -z "$PSPSDK"; then
- echo "Please set the path to PSPSDK in your environment."
+ echo "Please set PSPSDK in your environment. export PSPSDK=<path to psp sdk>"
exit 1
fi
;;
@@ -1414,6 +1385,9 @@ fi
echo "$cxx_version"
+#
+# Bail out now if now useable compiler was found.
+#
if test "$cxx_verc_fail" = yes ; then
echo
echo "The version of your compiler is not supported at this time"
@@ -1421,6 +1395,54 @@ if test "$cxx_verc_fail" = yes ; then
exit 1
fi
+#
+# Setup compiler specific CXXFLAGS now that we know the compiler version.
+# Foremost, this means enabling various warnings.
+# In addition, we set CXX_UPDATE_DEP_FLAG for GCC >= 3.0 and for ICC.
+#
+if test "$have_gcc" = yes ; then
+ if test "$_cxx_major" -ge "3" ; then
+ case $_host_os in
+ # newlib-based system include files suppress non-C89 function
+ # declarations under __STRICT_ANSI__
+ amigaos* | android | dreamcast | ds | gamecube | mingw* | n64 | psp | ps2 | wii | wince )
+ ;;
+ *)
+ CXXFLAGS="$CXXFLAGS -ansi"
+ ;;
+ esac
+ CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
+ add_line_to_config_mk 'HAVE_GCC3 = 1'
+ add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
+ fi;
+
+ if test "$_cxx_major" -eq 4 && test "$_cxx_minor" -ge 3 || \
+ test "$_cxx_major" -gt 4 ; then
+ CXXFLAGS="$CXXFLAGS -Wno-empty-body"
+ else
+ CXXFLAGS="$CXXFLAGS -Wconversion"
+ fi;
+elif test "$have_icc" = yes ; then
+ add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
+fi;
+
+# By default, we add -pedantic to the CXXFLAGS to catch some potentially
+# non-portable constructs, like use of GNU extensions.
+# However, some platforms use GNU extensions in system header files, so
+# for these we must not use -pedantic.
+case $_host_os in
+android | gamecube | psp | wii)
+ ;;
+*)
+ # ICC does not support pedantic, while GCC and clang do.
+ if test "$have_icc" = no ; then
+ CXXFLAGS="$CXXFLAGS -pedantic"
+ fi
+ ;;
+esac
+
+# If possible, we want to use -Wglobal-constructors
+# However, not all compilers support that, so check whether the active one does.
echocheck "whether -Wglobal-constructors work"
cat > $TMPC << EOF
int main() { return 0; }
@@ -1437,23 +1459,37 @@ echo $_global_constructors
#
echo_n "Checking endianness... "
cat > tmp_endianness_check.cpp << EOF
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+unsigned short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+unsigned short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
void _ascii() { char* s = (char*) ascii_mm; s = (char*) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+unsigned short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+unsigned short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
void _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; }
int main() { _ascii (); _ebcdic (); return 0; }
EOF
$CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp
if strings $TMPO.o | grep BIGenDianSyS >/dev/null; then
_endian=big
-else
+elif strings $TMPO.o | grep LiTTleEnDian >/dev/null; then
_endian=little
fi
echo $_endian;
cc_check_clean tmp_endianness_check.cpp
+case $_endian in
+ big)
+ add_line_to_config_h '#undef SCUMM_LITTLE_ENDIAN'
+ add_line_to_config_h '#define SCUMM_BIG_ENDIAN'
+ ;;
+ little)
+ add_line_to_config_h '#define SCUMM_LITTLE_ENDIAN'
+ add_line_to_config_h '#undef SCUMM_BIG_ENDIAN'
+ ;;
+ *)
+ exit 1
+ ;;
+esac
+
#
# Determine a data type with the given length
#
@@ -1503,6 +1539,50 @@ echo "$type_4_byte"
test $TMPR -eq 0 || exit 1 # check exit code of subshell
#
+# Check whether memory alignment is required
+#
+# For some CPU types, unaligned memory access is either not supported at
+# all (and so leads to a crash), requires a super-slow emulation via an
+# exception handler, or just results in incorrect results.
+# On the other hand, accessing data in a manner that works regardless of
+# alignment can be a lot slower than regular access, so we don't want
+# to use it if we don't have to.
+#
+# So we do the following: For CPU families where we know whether unaligned
+# access is safe & fast, we enable / disable unaligned access accordingly.
+# Otherwise, we just disable memory alignment.
+#
+# NOTE: In the past, for non-cross compiled builds, we would also run some code
+# which would try to test whether unaligned access worked or not. But this test
+# could not reliably determine whether unaligned access really worked in all
+# situations (and across different implementations of the target CPU arch), nor
+# whether it was fast (as opposed to slowly emulated by fault handlers). Hence,
+# we do not use this approach anymore.
+#
+# NOTE: The only kinds of unaligned access we allow are for 2 byte and 4
+# byte loads / stores. No promises are made for bigger sizes, such as 8
+# or 16 byte loads, for which architectures may behave differently than
+# for the smaller sizes.
+echo_n "Alignment required... "
+case $_host_cpu in
+ i[3-6]86 | x86_64 | ppc*)
+ # Unaligned access should work
+ _need_memalign=no
+ ;;
+ alpha* | arm* | bfin* | hp* | mips* | sh* | sparc* | ia64 | nv1*)
+ # Unaligned access is not supported or extremely slow.
+ _need_memalign=yes
+ ;;
+ *)
+ # Status of unaligned access is unknown, so assume the worst.
+ _need_memalign=yes
+ ;;
+esac
+echo "$_need_memalign"
+
+define_in_config_h_if_yes $_need_memalign 'SCUMM_NEED_ALIGNMENT'
+
+#
# Check whether we can use x86 asm routines
#
echo_n "Compiling for x86... "
@@ -1515,6 +1595,27 @@ case $_host_cpu in
;;
esac
echo "$_have_x86"
+define_in_config_h_if_yes $_have_x86 'HAVE_X86'
+
+#
+# Check whether to use optimized ARM asm
+#
+echo_n "Compiling for ARM... "
+case $_host_cpu in
+ arm*)
+ _arm_asm=yes
+ ;;
+ *)
+ _arm_asm=no
+ ;;
+esac
+echo "$_arm_asm"
+define_in_config_if_yes "$_arm_asm" 'USE_ARM_SCALER_ASM'
+define_in_config_if_yes "$_arm_asm" 'USE_ARM_SOUND_ASM'
+define_in_config_if_yes "$_arm_asm" 'USE_ARM_SMUSH_ASM'
+define_in_config_if_yes "$_arm_asm" 'USE_ARM_GFX_ASM'
+define_in_config_if_yes "$_arm_asm" 'USE_ARM_COSTUME_ASM'
+
#
# Determine build settings
@@ -1523,7 +1624,8 @@ echo_n "Checking hosttype... "
echo $_host_os
case $_host_os in
amigaos*)
- LDFLAGS="$LDFLAGS -use-dynld -L/sdk/local/newlib/lib"
+ LDFLAGS="$LDFLAGS -use-dynld"
+ LDFLAGS="$LDFLAGS -L/sdk/local/newlib/lib"
# We have to use 'long' for our 4 byte typedef because AmigaOS already typedefs (u)int32
# as (unsigned) long, and consequently we'd get a compiler error otherwise.
type_4_byte='long'
@@ -1532,30 +1634,41 @@ case $_host_os in
android)
case $_host in
android)
- CXXFLAGS="$CXXFLAGS -march=armv5te -mtune=xscale -msoft-float"
+ CXXFLAGS="$CXXFLAGS -march=armv5te"
+ CXXFLAGS="$CXXFLAGS -mtune=xscale"
+ CXXFLAGS="$CXXFLAGS -msoft-float"
;;
android-v7a)
- CXXFLAGS="$CXXFLAGS -march=armv7-a -mfloat-abi=softfp -mfpu=vfp"
+ CXXFLAGS="$CXXFLAGS -march=armv7-a"
+ CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp"
+ CXXFLAGS="$CXXFLAGS -mfpu=vfp"
LDFLAGS="$LDFLAGS -Wl,--fix-cortex-a8"
;;
esac
CXXFLAGS="$CXXFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
- CXXFLAGS="$CXXFLAGS -fpic -ffunction-sections -funwind-tables"
+ CXXFLAGS="$CXXFLAGS -fpic"
+ CXXFLAGS="$CXXFLAGS -ffunction-sections"
+ CXXFLAGS="$CXXFLAGS -funwind-tables"
if test "$_debug_build" = yes; then
- CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
+ CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer"
+ CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
else
- CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -fstrict-aliasing"
+ CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
+ CXXFLAGS="$CXXFLAGS -fstrict-aliasing"
fi
CXXFLAGS="$CXXFLAGS -finline-limit=300"
- CXXFLAGS="$CXXFLAGS -Os -mthumb-interwork"
- CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__"
- CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__"
+ CXXFLAGS="$CXXFLAGS -Os"
+ CXXFLAGS="$CXXFLAGS -mthumb-interwork"
+ # FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.
+ CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5__"
+ CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5T__"
+ CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5E__"
+ CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5TE__"
# supress 'mangling of 'va_list' has changed in GCC 4.4'
CXXFLAGS="$CXXFLAGS -Wno-psabi"
LDFLAGS="$LDFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
LDFLAGS="$LDFLAGS -mthumb-interwork"
add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
- _unix=yes
_seq_midi=no
;;
beos*)
@@ -1565,12 +1678,8 @@ case $_host_os in
CFLAGS="-I/boot/home/config/include"
CXXFLAGS="$CXXFLAGS -fhuge-objects"
LIBS="$LIBS -lbind -lsocket"
- _unix=yes
_seq_midi=no
;;
- bsd* | hpux* | netbsd* | openbsd* | sunos*)
- _unix=yes
- ;;
cygwin*)
echo ERROR: Cygwin building is not supported by ScummVM anymore. Consider using MinGW.
exit 1
@@ -1579,19 +1688,31 @@ case $_host_os in
DEFINES="$DEFINES -DMACOSX"
LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
add_line_to_config_mk 'MACOSX = 1'
- _unix=yes
;;
dreamcast)
- DEFINES="$DEFINES -D__DC__ -DNONSTANDARD_PORT"
+ DEFINES="$DEFINES -D__DC__"
+ DEFINES="$DEFINES -DNONSTANDARD_PORT"
;;
ds)
- # TODO Nintendo DS
- DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT"
- CXXFLAGS="$CXXFLAGS -isystem $DEVKITPRO/libnds/include -isystem $DEVKITPRO/devkitARM/arm-eabi/include"
- CXXFLAGS="$CXXFLAGS -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -mthumb-interwork"
- CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fno-strict-aliasing"
+ DEFINES="$DEFINES -D__DS__"
+ DEFINES="$DEFINES -DNDS"
+ DEFINES="$DEFINES -DARM9"
+ DEFINES="$DEFINES -DARM"
+ DEFINES="$DEFINES -DNONSTANDARD_PORT"
+ CXXFLAGS="$CXXFLAGS -isystem $DEVKITPRO/libnds/include"
+ CXXFLAGS="$CXXFLAGS -isystem $DEVKITPRO/devkitARM/arm-eabi/include"
+ CXXFLAGS="$CXXFLAGS -mcpu=arm9tdmi"
+ CXXFLAGS="$CXXFLAGS -mtune=arm9tdmi"
+ CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
+ CXXFLAGS="$CXXFLAGS -mthumb-interwork"
+ CXXFLAGS="$CXXFLAGS -ffunction-sections"
+ CXXFLAGS="$CXXFLAGS -fdata-sections"
+ CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
CXXFLAGS="$CXXFLAGS -fuse-cxa-atexit"
- LDFLAGS="$LDFLAGS -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt"
+ LDFLAGS="$LDFLAGS -specs=ds_arm9.specs"
+ LDFLAGS="$LDFLAGS -mthumb-interwork"
+ LDFLAGS="$LDFLAGS -mno-fpu"
+ LDFLAGS="$LDFLAGS -Wl,-Map,map.txt"
if test "$_dynamic_modules" = no ; then
LDFLAGS="$LDFLAGS -Wl,--gc-sections"
else
@@ -1605,15 +1726,23 @@ case $_host_os in
freebsd*)
LDFLAGS="$LDFLAGS -L/usr/local/lib"
CXXFLAGS="$CXXFLAGS -I/usr/local/include"
- _unix=yes
;;
gamecube)
- CXXFLAGS="$CXXFLAGS -Os -mogc -mcpu=750 -meabi -mhard-float"
- CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fmodulo-sched"
+ CXXFLAGS="$CXXFLAGS -Os"
+ CXXFLAGS="$CXXFLAGS -mogc"
+ CXXFLAGS="$CXXFLAGS -mcpu=750"
+ CXXFLAGS="$CXXFLAGS -meabi"
+ CXXFLAGS="$CXXFLAGS -mhard-float"
+ CXXFLAGS="$CXXFLAGS -ffunction-sections"
+ CXXFLAGS="$CXXFLAGS -fdata-sections"
+ CXXFLAGS="$CXXFLAGS -fmodulo-sched"
CXXFLAGS="$CXXFLAGS -fuse-cxa-atexit"
CXXFLAGS="$CXXFLAGS -I$DEVKITPRO/libogc/include"
# libogc is required to link the cc tests (includes _start())
- LDFLAGS="$LDFLAGS -mogc -mcpu=750 -L$DEVKITPRO/libogc/lib/cube -logc"
+ LDFLAGS="$LDFLAGS -mogc"
+ LDFLAGS="$LDFLAGS -mcpu=750"
+ LDFLAGS="$LDFLAGS -L$DEVKITPRO/libogc/lib/cube"
+ LDFLAGS="$LDFLAGS -logc"
if test "$_dynamic_modules" = "yes" ; then
# retarded toolchain patch forces --gc-sections, overwrite it
LDFLAGS="$LDFLAGS -Wl,--no-gc-sections"
@@ -1623,14 +1752,13 @@ case $_host_os in
DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
# Needs -lnetwork for the timidity MIDI driver
LIBS="$LIBS -lnetwork"
- _unix=yes
_seq_midi=no
;;
irix*)
- DEFINES="$DEFINES -DIRIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+ DEFINES="$DEFINES -DIRIX"
+ DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
LIBS="$LIBS -lmd -lfastm -lm"
_ranlib=:
- _unix=yes
;;
linux* | uclinux*)
# When not cross-compiling, enable large file support, but don't
@@ -1638,74 +1766,101 @@ case $_host_os in
if test -z "$_host"; then
CXXFLAGS="$CXXFLAGS $(getconf LFS_CFLAGS 2>/dev/null)"
fi
- _unix=yes
- DEFINES="$DEFINES -DLUA_USE_POSIX"
;;
mingw*)
- DEFINES="$DEFINES -DWIN32 -D__USE_MINGW_ANSI_STDIO=0"
+ DEFINES="$DEFINES -DWIN32"
+ DEFINES="$DEFINES -D__USE_MINGW_ANSI_STDIO=0"
LIBS="$LIBS -lmingw32 -lwinmm"
OBJS="$OBJS scummvmwinres.o"
add_line_to_config_mk 'WIN32 = 1'
;;
mint*)
DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
- _unix=yes
;;
n64)
- DEFINES="$DEFINES -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT"
- DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_COMMAND_LINE"
- DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU"
+ DEFINES="$DEFINES -D__N64__"
+ DEFINES="$DEFINES -DLIMIT_FPS"
+ DEFINES="$DEFINES -DNONSTANDARD_PORT"
+ DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
+ DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
+ DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+ DEFINES="$DEFINES -DDISABLE_FANCY_THEMES"
+ DEFINES="$DEFINES -DDISABLE_NES_APU"
+ DEFINES="$DEFINES -DDISABLE_SID"
DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
;;
- os2-emx*)
- _unix=yes # FIXME??? Why??
- ;;
ps2)
- # TODO ps2
CXXFLAGS="$CXXFLAGS -G2"
- DEFINES="$DEFINES -D_EE -D__PLAYSTATION2__"
+ DEFINES="$DEFINES -D_EE"
+ DEFINES="$DEFINES -D__PLAYSTATION2__"
;;
psp)
- CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150"
+ if test -d "$PSPDEV/psp/lib"; then
+ LDFLAGS="$LDFLAGS -L$PSPDEV/psp/lib"
+ fi
+ LDFLAGS="$LDFLAGS -L$PSPSDK/lib"
+ LDFLAGS="$LDFLAGS -specs=$_srcdir/backends/platform/psp/psp.spec"
+ CXXFLAGS="$CXXFLAGS -O3"
+ CXXFLAGS="$CXXFLAGS -I$PSPSDK/include"
+ # FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.
+ CXXFLAGS="$CXXFLAGS -D_PSP_FW_VERSION=150"
;;
solaris*)
- DEFINES="$DEFINES -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+ DEFINES="$DEFINES -DSOLARIS"
+ DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
# Needs -lbind -lsocket for the timidity MIDI driver
LIBS="$LIBS -lnsl -lsocket"
- _unix=yes
;;
webos)
- CXXFLAGS="$CXXFLAGS -I$WEBOS_PDK/include -I$WEBOS_PDK/include/SDL -I$WEBOS_PDK/device/usr/include"
+ CXXFLAGS="$CXXFLAGS -I$WEBOS_PDK/include"
+ CXXFLAGS="$CXXFLAGS -I$WEBOS_PDK/include/SDL"
+ CXXFLAGS="$CXXFLAGS -I$WEBOS_PDK/device/usr/include"
# These compiler options are needed to support the Palm Pixi
- CXXFLAGS="$CXXFLAGS -mcpu=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
- LDFLAGS="$LDFLAGS -L$WEBOS_PDK/device/lib -L$WEBOS_PDK/device/usr/lib"
+ CXXFLAGS="$CXXFLAGS -mcpu=arm1136jf-s"
+ CXXFLAGS="$CXXFLAGS -mfpu=vfp "
+ CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp"
+ LDFLAGS="$LDFLAGS -L$WEBOS_PDK/device/lib"
+ LDFLAGS="$LDFLAGS -L$WEBOS_PDK/device/usr/lib"
LDFLAGS="$LDFLAGS -Wl,--allow-shlib-undefined"
LDFLAGS="$LDFLAGS --sysroot=$WEBOS_PDK/arm-gcc/sysroot"
add_line_to_config_mk "WEBOS_SDK = $WEBOS_SDK"
- _unix=yes
_seq_midi=no
;;
wii)
- CXXFLAGS="$CXXFLAGS -Os -mrvl -mcpu=750 -meabi -mhard-float"
- CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fmodulo-sched"
+ CXXFLAGS="$CXXFLAGS -Os"
+ CXXFLAGS="$CXXFLAGS -mrvl"
+ CXXFLAGS="$CXXFLAGS -mcpu=750"
+ CXXFLAGS="$CXXFLAGS -meabi"
+ CXXFLAGS="$CXXFLAGS -mhard-float"
+ CXXFLAGS="$CXXFLAGS -ffunction-sections"
+ CXXFLAGS="$CXXFLAGS -fdata-sections"
+ CXXFLAGS="$CXXFLAGS -fmodulo-sched"
CXXFLAGS="$CXXFLAGS -fuse-cxa-atexit"
CXXFLAGS="$CXXFLAGS -I$DEVKITPRO/libogc/include"
# libogc is required to link the cc tests (includes _start())
- LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -L$DEVKITPRO/libogc/lib/wii -logc"
+ LDFLAGS="$LDFLAGS -mrvl"
+ LDFLAGS="$LDFLAGS -mcpu=750"
+ LDFLAGS="$LDFLAGS -L$DEVKITPRO/libogc/lib/wii"
+ LDFLAGS="$LDFLAGS -logc"
if test "$_dynamic_modules" = "yes" ; then
# retarded toolchain patch forces --gc-sections, overwrite it
LDFLAGS="$LDFLAGS -Wl,--no-gc-sections"
fi
;;
wince)
- CXXFLAGS="$CXXFLAGS -O3 -fno-inline-functions -march=armv4 -mtune=xscale -D_WIN32_WCE=300 "
- DEFINES="$DEFINES -D__ARM__ -D_ARM_ -DUNICODE -DFPM_DEFAULT -DNONSTANDARD_PORT"
- DEFINES="$DEFINES -DWIN32 -Dcdecl= -D__cdecl__="
- ;;
- # given this is a shell script assume some type of unix
- *)
- echo "WARNING: could not establish system type, assuming unix like"
- _unix=yes
+ CXXFLAGS="$CXXFLAGS -O3"
+ CXXFLAGS="$CXXFLAGS -fno-inline-functions"
+ CXXFLAGS="$CXXFLAGS -march=armv4"
+ CXXFLAGS="$CXXFLAGS -mtune=xscale"
+ DEFINES="$DEFINES -D_WIN32_WCE=300"
+ DEFINES="$DEFINES -D__ARM__"
+ DEFINES="$DEFINES -D_ARM_"
+ DEFINES="$DEFINES -DUNICODE"
+ DEFINES="$DEFINES -DFPM_DEFAULT"
+ DEFINES="$DEFINES -DNONSTANDARD_PORT"
+ DEFINES="$DEFINES -DWIN32"
+ DEFINES="$DEFINES -Dcdecl="
+ DEFINES="$DEFINES -D__cdecl__="
;;
esac
@@ -1714,48 +1869,39 @@ if test -n "$_host"; then
echo "Cross-compiling to $_host"
case "$_host" in
android | android-v7a)
- _unix=yes
- _need_memalign=yes
# we link a .so as default
- LDFLAGS="$LDFLAGS -shared -Wl,-Bsymbolic,--no-undefined"
+ LDFLAGS="$LDFLAGS -shared"
+ LDFLAGS="$LDFLAGS -Wl,-Bsymbolic,--no-undefined"
HOSTEXEPRE=lib
HOSTEXEEXT=.so
_backend="android"
_port_mk="backends/platform/android/android.mk"
- _arm_asm=yes
_build_scalers=no
_seq_midi=no
_mt32emu=no
_timidity=no
;;
arm-linux|arm*-linux-gnueabi|arm-*-linux)
- _unix=yes
- _need_memalign=yes
- _arm_asm=yes
;;
arm-riscos|linupy)
DEFINES="$DEFINES -DLINUPY"
- _unix=yes
- _need_memalign=yes
;;
bfin*)
- _need_memalign=yes
;;
caanoo)
# This uses the GPH backend.
DEFINES="$DEFINES -DGPH_DEVICE"
- DEFINES="$DEFINES -DCAANOO -DREDUCE_MEMORY_USAGE"
+ DEFINES="$DEFINES -DCAANOO"
+ DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
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"
+ CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s"
+ CXXFLAGS="$CXXFLAGS -mtune=arm926ej-s"
ASFLAGS="$ASFLAGS"
- _unix=yes
- _need_memalign=yes
- _arm_asm=yes
_backend="gph"
_build_hq_scalers=no
_vkeybd=yes
@@ -1769,10 +1915,12 @@ if test -n "$_host"; then
_strip=$_host-strip
;;
dingux)
- DEFINES="$DEFINES -DUNIX -DDINGUX -DDISABLE_DOSBOX_OPL -DREDUCE_MEMORY_USAGE"
+ DEFINES="$DEFINES -DDINGUX"
+ DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+ DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
ASFLAGS="$ASFLAGS"
- CXXFLAGS="$CXXFLAGS -msoft-float -mips32"
- _need_memalign=yes
+ CXXFLAGS="$CXXFLAGS -msoft-float"
+ CXXFLAGS="$CXXFLAGS -mips32"
_backend="dingux"
_mt32emu=no
_vkeybd=yes
@@ -1785,9 +1933,17 @@ if test -n "$_host"; then
_port_mk="backends/platform/dingux/dingux.mk"
;;
dreamcast)
- DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
- CXXFLAGS="$CXXFLAGS -O3 -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks"
- _need_memalign=yes
+ DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
+ DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE"
+ DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
+ if test "$_release_build" = yes; then
+ DEFINES="$DEFINES -DNOSERIAL"
+ fi
+ CXXFLAGS="$CXXFLAGS -O3"
+ CXXFLAGS="$CXXFLAGS -funroll-loops"
+ CXXFLAGS="$CXXFLAGS -fschedule-insns2"
+ CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
+ CXXFLAGS="$CXXFLAGS -fdelete-null-pointer-checks"
_backend="dc"
_build_scalers=no
_mad=yes
@@ -1796,23 +1952,22 @@ if test -n "$_host"; then
_port_mk="backends/platform/dc/dreamcast.mk"
;;
ds)
- # TODO: complete this
- DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555"
- DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
- DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE -DSTREAM_AUDIO_FROM_DISK"
- DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU"
DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
- _need_memalign=yes
- _arm_asm=yes
- add_line_to_config_h '#define DISABLE_TEXT_CONSOLE'
+ DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
+ DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+ DEFINES="$DEFINES -DDISABLE_FANCY_THEMES"
+ DEFINES="$DEFINES -DDISABLE_SID"
+ DEFINES="$DEFINES -DDISABLE_NES_APU"
+ DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE"
+ DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
+ DEFINES="$DEFINES -DSTREAM_AUDIO_FROM_DISK"
+ DEFINES="$DEFINES -DVECTOR_RENDERER_FORMAT=1555"
_backend="ds"
_build_scalers=no
_mt32emu=no
_port_mk="backends/platform/ds/ds.mk"
;;
gamecube)
- _endian=big
- _need_memalign=yes
_backend="wii"
_build_scalers=no
_mt32emu=no
@@ -1828,16 +1983,14 @@ if test -n "$_host"; then
gp2x)
# This uses the GPH backend.
DEFINES="$DEFINES -DGPH_DEVICE"
- DEFINES="$DEFINES -DGP2X -DREDUCE_MEMORY_USAGE"
+ DEFINES="$DEFINES -DGP2X"
+ DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
if test "$_debug_build" = yes; then
DEFINES="$DEFINES -DGPH_DEBUG"
fi
CXXFLAGS="$CXXFLAGS -march=armv4t"
ASFLAGS="$ASFLAGS -mfloat-abi=soft"
LDFLAGS="$LDFLAGS -static"
- _unix=yes
- _need_memalign=yes
- _arm_asm=yes
_backend="gph"
_build_hq_scalers=no
_vkeybd=yes
@@ -1849,15 +2002,14 @@ if test -n "$_host"; then
gp2xwiz)
# This uses the GPH backend.
DEFINES="$DEFINES -DGPH_DEVICE"
- DEFINES="$DEFINES -DGP2XWIZ -DREDUCE_MEMORY_USAGE"
+ DEFINES="$DEFINES -DGP2XWIZ"
+ DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
if test "$_debug_build" = yes; then
DEFINES="$DEFINES -DGPH_DEBUG"
fi
- CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
+ CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s"
+ CXXFLAGS="$CXXFLAGS -mtune=arm926ej-s"
ASFLAGS="$ASFLAGS -mfloat-abi=soft"
- _unix=yes
- _need_memalign=yes
- _arm_asm=yes
_backend="gph"
_build_hq_scalers=no
_vkeybd=yes
@@ -1868,18 +2020,12 @@ if test -n "$_host"; then
;;
iphone)
DEFINES="$DEFINES -DIPHONE"
- _unix=yes
- _need_memalign=yes
- _arm_asm=yes
_backend="iphone"
_build_hq_scalers=no
_seq_midi=no
;;
m68k-atari-mint)
DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
- _unix=yes
- _endian=big
- _need_memalign=yes
_ranlib=m68k-atari-mint-ranlib
_ar="m68k-atari-mint-ar cru"
_seq_midi=no
@@ -1893,15 +2039,10 @@ if test -n "$_host"; then
mips-sgi*)
LDFLAGS="$LDFLAGS -static-libgcc"
LIBS="$LIBS -laudio"
- _endian=big
- _need_memalign=yes
;;
motoezx)
DEFINES="$DEFINES -DMOTOEZX"
ASFLAGS="$ASFLAGS -mfpu=vfp"
- _unix=yes
- _need_memalign=yes
- _arm_asm=yes
_backend="linuxmoto"
_build_hq_scalers=no
_mt32emu=no
@@ -1912,9 +2053,6 @@ if test -n "$_host"; then
motomagx)
DEFINES="$DEFINES -DMOTOMAGX"
ASFLAGS="$ASFLAGS -mfpu=vfp"
- _unix=yes
- _need_memalign=yes
- _arm_asm=yes
_backend="linuxmoto"
_build_hq_scalers=no
_mt32emu=no
@@ -1923,16 +2061,23 @@ if test -n "$_host"; then
_port_mk="backends/platform/linuxmoto/linuxmoto.mk"
;;
n64)
- CXXFLAGS="$CXXFLAGS -mno-extern-sdata --param max-inline-insns-auto=20 -fomit-frame-pointer"
- CXXFLAGS="$CXXFLAGS -march=vr4300 -mtune=vr4300 -mhard-float"
- LDFLAGS="$LDFLAGS -march=vr4300 -mtune=vr4300 -nodefaultlibs -nostartfiles -mno-crt0"
- LDFLAGS="$LDFLAGS -L$N64SDK/hkz-libn64 -L$N64SDK/lib"
+ CXXFLAGS="$CXXFLAGS -mno-extern-sdata"
+ CXXFLAGS="$CXXFLAGS --param max-inline-insns-auto=20"
+ CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
+ CXXFLAGS="$CXXFLAGS -march=vr4300"
+ CXXFLAGS="$CXXFLAGS -mtune=vr4300"
+ CXXFLAGS="$CXXFLAGS -mhard-float"
+ LDFLAGS="$LDFLAGS -march=vr4300"
+ LDFLAGS="$LDFLAGS -mtune=vr4300"
+ LDFLAGS="$LDFLAGS -nodefaultlibs"
+ LDFLAGS="$LDFLAGS -nostartfiles"
+ LDFLAGS="$LDFLAGS -mno-crt0"
+ LDFLAGS="$LDFLAGS -L$N64SDK/hkz-libn64"
+ LDFLAGS="$LDFLAGS -L$N64SDK/lib"
LDFLAGS="$LDFLAGS -T n64ld_cpp.x -Xlinker -Map -Xlinker scummvm.map"
_backend="n64"
- _need_memalign=yes
_mt32emu=no
_build_scalers=no
- _indeo3=no
_translation=no
_keymapper=no
_text_console=no
@@ -1947,25 +2092,23 @@ if test -n "$_host"; then
;;
neuros)
DEFINES="$DEFINES -DNEUROS"
- _unix=yes
- _need_memalign=yes
_backend='null'
_build_hq_scalers=no
_mt32emu=no
;;
openpandora)
- DEFINES="$DEFINES -DOPENPANDORA -DREDUCE_MEMORY_USAGE"
+ DEFINES="$DEFINES -DOPENPANDORA"
+ DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
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"
+ CXXFLAGS="$CXXFLAGS -march=armv7-a"
+ CXXFLAGS="$CXXFLAGS -mtune=cortex-a8"
+ CXXFLAGS="$CXXFLAGS -mfpu=neon"
ASFLAGS="$ASFLAGS -mfloat-abi=soft"
- _unix=yes
- _need_memalign=yes
- _arm_asm=yes
_backend="openpandora"
_build_hq_scalers=yes
_vkeybd=no
@@ -1974,15 +2117,13 @@ if test -n "$_host"; then
_port_mk="backends/platform/openpandora/op-bundle.mk"
;;
ppc-amigaos)
- _endian=big
- # AmigaOS exec allocates memory always in an aligned way
- _need_memalign=yes
;;
ps2)
- # TODO: complete this
- DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
- DEFINES="$DEFINES -DDISABLE_SID -DDISABLE_NES_APU"
- _need_memalign=yes
+ DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE"
+ DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
+ DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+ DEFINES="$DEFINES -DDISABLE_SID"
+ DEFINES="$DEFINES -DDISABLE_NES_APU"
_backend="ps2"
_build_scalers=no
_mt32emu=no
@@ -2002,34 +2143,30 @@ if test -n "$_host"; then
DEFINES="$DEFINES -D__PS2_DEBUG__"
#INCLUDES="$INCLUDES -I$(PS2GDB)/ee"
#LDFLAGS="$LDFLAGS -L$(PS2GDB)/lib"
- LDFLAGS="$LDFLAGS -lps2gdbStub -lps2ip -ldebug"
+ LDFLAGS="$LDFLAGS -lps2gdbStub"
+ LDFLAGS="$LDFLAGS -lps2ip"
+ LDFLAGS="$LDFLAGS -ldebug"
else
# If not building for debug mode, strip binaries.
CXXFLAGS="$CXXFLAGS -s"
fi
;;
psp)
- _need_memalign=yes
_backend="psp"
_build_scalers=no
_mt32emu=no
_port_mk="backends/platform/psp/psp.mk"
;;
samsungtv)
- DEFINES="$DEFINES -DSAMSUNGTV -DDISABLE_COMMAND_LINE"
+ DEFINES="$DEFINES -DSAMSUNGTV"
+ DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
ASFLAGS="$ASFLAGS -mfpu=vfp"
HOSTEXEEXT=".so"
- _unix=yes
- _need_memalign=yes
- _arm_asm=yes
_backend="samsungtv"
_mt32emu=no
_vkeybd=yes
;;
webos)
- _unix=yes
- _need_memalign=yes
- _arm_asm=yes
_backend="webos"
_port_mk="backends/platform/webos/webos.mk"
_build_scalers=no
@@ -2040,8 +2177,6 @@ if test -n "$_host"; then
_keymapper=yes
;;
wii)
- _endian=big
- _need_memalign=yes
_backend="wii"
_build_scalers=no
_port_mk="backends/platform/wii/wii.mk"
@@ -2056,8 +2191,6 @@ if test -n "$_host"; then
;;
wince)
LDFLAGS="$LDFLAGS -Wl,--stack,65536"
- _need_memalign=yes
- _arm_asm=yes
_tremolo=yes
_backend="wince"
_mt32emu=no
@@ -2067,55 +2200,149 @@ if test -n "$_host"; then
echo "WARNING: Unknown target, continuing with auto-detected values"
;;
esac
+fi
-else
- #
- # Check whether memory alignment is required
- #
- echo_n "Alignment required... "
- case $_host_cpu in
- alpha*)
- # Hardcode alignment requirements for Alpha processsors
- _need_memalign=yes
- ;;
- arm*)
- _need_memalign=yes
- ;;
- mips*)
- # Hardcode alignment requirements for MIPS processsors.
- # While these can emulate unaligned memory access, this
- # emulation is rather slow.
- _need_memalign=yes
- ;;
- sh*)
- # Hardcode alignment requirements for SH processsors.
- # While these can emulate unaligned memory access, this
- # emulation is rather slow.
- _need_memalign=yes
+#
+# Backend related stuff
+#
+case $_backend in
+ android)
+ # ssp at this point so the cxxtests link
+ if test "$_debug_build" = yes; then
+ CXXFLAGS="$CXXFLAGS -fstack-protector"
+ else
+ CXXFLAGS="$CXXFLAGS -fno-stack-protector"
+ fi
+ CXXFLAGS="$CXXFLAGS -Wa,--noexecstack"
+ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
+
+ DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
+ ;;
+ dc)
+ INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc'
+ INCLUDES="$INCLUDES "'-isystem $(ronindir)/include'
+ LDFLAGS="$LDFLAGS -Wl,-Ttext,0x8c010000"
+ LDFLAGS="$LDFLAGS -nostartfiles"
+ LDFLAGS="$LDFLAGS "'$(ronindir)/lib/crt0.o'
+ LDFLAGS="$LDFLAGS "'-L$(ronindir)/lib'
+ if test "$_release_build" = yes; then
+ LIBS="$LIBS -lronin-noserial -lm"
+ else
+ LIBS="$LIBS -lronin -lm"
+ fi
+ ;;
+ dingux)
+ DEFINES="$DEFINES -DDINGUX"
+ ;;
+ ds)
+ INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source'
+ INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude'
+ INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
+ ;;
+ gp2x)
+ ;;
+ gph)
+ ;;
+ iphone)
+ OBJCFLAGS="$OBJCFLAGS --std=c99"
+ LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES"
+ LIBS="$LIBS -framework QuartzCore -framework GraphicsServices -framework CoreFoundation"
+ LIBS="$LIBS -framework Foundation -framework AudioToolbox -framework CoreAudio"
+ ;;
+ linuxmoto)
+ DEFINES="$DEFINES -DLINUXMOTO"
+ ;;
+ n64)
+ INCLUDES="$INCLUDES "'-I$(N64SDK)/include'
+ INCLUDES="$INCLUDES "'-I$(N64SDK)/mips64/include'
+ INCLUDES="$INCLUDES "'-I$(N64SDK)/hkz-libn64'
+ INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/n64'
+ LIBS="$LIBS -lpakfs -lframfs -ln64 -ln64utils -lromfs"
+ LIBS="$LIBS -lm -lstdc++ -lz"
+ ;;
+ null)
+ DEFINES="$DEFINES -DUSE_NULL_DRIVER"
+ ;;
+ openpandora)
+ ;;
+ ps2)
+ DEFINES="$DEFINES -D_EE"
+ DEFINES="$DEFINES -DFORCE_RTL"
+ INCLUDES="$INCLUDES -I$PS2SDK/ee/include"
+ INCLUDES="$INCLUDES -I$PS2SDK/common/include"
+ INCLUDES="$INCLUDES -I$PS2SDK/ports/include"
+ if test "$_dynamic_modules" = no ; then
+ LDFLAGS="$LDFLAGS -mno-crt0"
+ LDFLAGS="$LDFLAGS $PS2SDK/ee/startup/crt0.o"
+ LDFLAGS="$LDFLAGS -T $PS2SDK/ee/startup/linkfile"
+ fi
+ LDFLAGS="$LDFLAGS -L$PS2SDK/ee/lib"
+ LDFLAGS="$LDFLAGS -L$PS2SDK/ports/lib"
+ LIBS="$LIBS -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm"
+ LIBS="$LIBS -lm -lc -lfileXio -lkernel -lstdc++"
+ ;;
+ psp)
+ DEFINES="$DEFINES -D__PSP__"
+ DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
+ DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+ LIBS="$LIBS -lpng"
+ LIBS="$LIBS -Wl,-Map,mapfile.txt"
+ ;;
+ samsungtv)
+ DEFINES="$DEFINES -DSAMSUNGTV"
+ LDFLAGS="$LDFLAGS -shared"
+ LDFLAGS="$LDFLAGS -fpic"
+ ;;
+ webos)
+ # There is no sdl-config in the WebOS PDK so we don't use find_sdlconfig here.
+ LIBS="$LIBS -lSDL"
+ DEFINES="$DEFINES -DWEBOS"
+ DEFINES="$DEFINES -DSDL_BACKEND"
+ add_line_to_config_mk "SDL_BACKEND = 1"
+ MODULES="$MODULES backends/platform/sdl"
+ ;;
+ wii)
+ DEFINES="$DEFINES -D__WII__"
+ DEFINES="$DEFINES -DGEKKO"
+ case $_host_os in
+ gamecube)
+ LIBS="$LIBS -lgxflux -liso9660 -lfat -logc -ldb"
;;
*)
- # Try to auto-detect....
- cat > $TMPC << EOF
-#include <stdlib.h>
-#include <signal.h>
-int main(int argc, char **argv) {
- unsigned char test[8] = { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88 };
- signal(SIGBUS, exit);
- signal(SIGABRT, exit);
- signal(SIGSEGV, exit);
- if (*((unsigned int *)(test + 1)) != 0x55443322 && *((unsigned int *)(test + 1)) != 0x22334455) {
- return 1;
- }
- return 0;
-}
-EOF
- _need_memalign=yes
- cc_check_no_clean && $TMPO$HOSTEXEEXT && _need_memalign=no
- cc_check_clean
+ LIBS="$LIBS -lgxflux -ldi -liso9660 -ltinysmb -lfat -lwiiuse -lbte -logc -lwiikeyboard -ldb"
;;
- esac
- echo "$_need_memalign"
-fi
+ esac
+ ;;
+ wince)
+ INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/wince'
+ INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/wince/CEgui'
+ INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/wince/CEkeys'
+ LIBS="$LIBS -static -lSDL"
+ DEFINES="$DEFINES -DSDL_BACKEND"
+ add_line_to_config_mk "SDL_BACKEND = 1"
+ ;;
+ sdl)
+ ;;
+ *)
+ echo "support for $_backend backend not implemented in configure script yet"
+ exit 1
+ ;;
+esac
+MODULES="$MODULES backends/platform/$_backend"
+
+#
+# Setup SDL specifics for SDL based backends
+#
+case $_backend in
+ dingux | gp2x | gph | linuxmoto | openpandora | samsungtv | sdl)
+ find_sdlconfig
+ INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+ LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+ DEFINES="$DEFINES -DSDL_BACKEND"
+ add_line_to_config_mk "SDL_BACKEND = 1"
+ ;;
+esac
+
#
# Enable 16bit support only for backends which support it
@@ -2135,29 +2362,38 @@ esac
#
-# Add the results of the above checks to config.h
+# Determine whether host is POSIX compliant, or at least POSIX
+# compatible enough to support our POSIX code (including dlsym(),
+# mkdir() and some other APIs).
#
-case $_endian in
- big)
- add_line_to_config_h '#undef SCUMM_LITTLE_ENDIAN'
- add_line_to_config_h '#define SCUMM_BIG_ENDIAN'
+# TODO: Instead of basing this on the host name, we should really base
+# this on the presence of features (such as the dlsym and mkdir APIs).
+#
+echo_n "Checking if host is POSIX compliant... "
+case $_host_os in
+ amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | psp | wii | wince)
+ _posix=no
;;
- little)
- add_line_to_config_h '#define SCUMM_LITTLE_ENDIAN'
- add_line_to_config_h '#undef SCUMM_BIG_ENDIAN'
+ android | beos* | bsd* | darwin* | freebsd* | gph-linux | haiku* | hpux* | iphone | irix* | linux* | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
+ _posix=yes
+ ;;
+ os2-emx*)
+ _posix=yes # FIXME: Really???
;;
*)
- exit 1
+ # given this is a shell script, we might assume some type of posix.
+ # However, the host system might be a totally different one, so
+ # we can assume nothing about it.
+ # Indeed, as mentioned further above, we really should test for the
+ # presences of relevant APIs on the host anyway...
+ _posix=no
;;
esac
+echo $_posix
-define_in_config_h_if_yes $_have_x86 'HAVE_X86'
-
-define_in_config_h_if_yes $_need_memalign 'SCUMM_NEED_ALIGNMENT'
-
-if test "$_unix" = yes ; then
- DEFINES="$DEFINES -DUNIX"
- add_line_to_config_mk 'UNIX = 1'
+if test "$_posix" = yes ; then
+ DEFINES="$DEFINES -DPOSIX"
+ add_line_to_config_mk 'POSIX = 1'
fi
#
@@ -2173,16 +2409,15 @@ add_to_config_mk_if_yes "$_verbose_build" 'VERBOSE_BUILD = 1'
echo_n "Checking whether building plugins was requested... "
echo "$_dynamic_modules"
_mak_plugins=
-_def_plugin="/* -> plugins disabled */"
if test "$_dynamic_modules" = yes ; then
echo_n "Checking whether building plugins is supported... "
case $_host_os in
android)
-_def_plugin='
-#define PLUGIN_PREFIX "lib"
-#define PLUGIN_SUFFIX ".so"
-'
+ _plugin_prefix="lib"
+ _plugin_suffix=".so"
+ CXXFLAGS="$CXXFLAGS -fpic"
+ LIBS="$LIBS -ldl"
# Work around an Android 2.0+ run-time linker bug:
# The linker doesn't actually look in previously
# loaded libraries when trying to resolve symbols -
@@ -2192,47 +2427,29 @@ _def_plugin='
# (otherwise unnecessary) dependency from plugins back
# to the main libscummvm.so.
_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX := lib
-PLUGIN_SUFFIX := .so
PLUGIN_EXTRA_DEPS = libscummvm.so
-CXXFLAGS += -DDYNAMIC_MODULES
-CXXFLAGS += -fpic
PLUGIN_LDFLAGS += $(LDFLAGS) -L. -lscummvm
PRE_OBJS_FLAGS := -Wl,-export-dynamic -Wl,-whole-archive
POST_OBJS_FLAGS := -Wl,-no-whole-archive
-LIBS += -ldl
'
;;
darwin*)
-_def_plugin='
-#define PLUGIN_PREFIX ""
-#define PLUGIN_SUFFIX ".plugin"
-'
+ _plugin_prefix=""
+ _plugin_suffix=".plugin"
+ LIBS="$LIBS -ldl"
_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX :=
-PLUGIN_SUFFIX := .plugin
PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
-CXXFLAGS += -DDYNAMIC_MODULES
PLUGIN_LDFLAGS += -bundle -bundle_loader $(EXECUTABLE) -exported_symbols_list "$(srcdir)/plugin.exp"
PRE_OBJS_FLAGS := -all_load
POST_OBJS_FLAGS :=
-LIBS += -ldl
'
;;
dreamcast)
-_def_plugin='
-#define PLUGIN_PREFIX ""
-#define PLUGIN_SUFFIX ".plg"
-'
+ _plugin_prefix=""
+ _plugin_suffix=".plg"
_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX :=
-PLUGIN_SUFFIX := .plg
PLUGIN_EXTRA_DEPS = $(abspath $(srcdir)/backends/platform/dc/plugin.x $(srcdir)/backends/platform/dc/plugin.syms) $(EXECUTABLE) backends/platform/dc/plugin_head.o
-CXXFLAGS += -DDYNAMIC_MODULES
-PLUGIN_LDFLAGS = -ml -m4-single-only -nostartfiles -Wl,-q,-T$(srcdir)/backends/platform/dc/plugin.x,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/platform/dc/plugin.syms -L$(ronindir)/lib backends/platform/dc/plugin_head.o
+PLUGIN_LDFLAGS = -ml -m4-single-only -nostartfiles -Wl,-q,-T$(srcdir)/backends/platform/dc/plugin.x,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/platform/dc/plugin.syms backends/platform/dc/plugin_head.o
PRE_OBJS_FLAGS := -Wl,--whole-archive
POST_OBJS_FLAGS := -Wl,--no-whole-archive
'
@@ -2245,17 +2462,11 @@ PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/ds/plugin.ld -mthumb-interwo
'
;;
freebsd*)
-_def_plugin='
-#define PLUGIN_PREFIX "lib"
-#define PLUGIN_SUFFIX ".so"
-'
+ _plugin_prefix="lib"
+ _plugin_suffix=".so"
+ CXXFLAGS="$CXXFLAGS -fpic"
_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX := lib
-PLUGIN_SUFFIX := .so
PLUGIN_EXTRA_DEPS =
-CXXFLAGS += -DDYNAMIC_MODULES
-CXXFLAGS += -fpic
PLUGIN_LDFLAGS += -shared
PRE_OBJS_FLAGS := -Wl,-export-dynamic -Wl,-whole-archive
POST_OBJS_FLAGS := -Wl,-no-whole-archive
@@ -2269,52 +2480,34 @@ PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/wii/plugin.ld
'
;;
gph*)
-_def_plugin='
-#define PLUGIN_PREFIX ""
-#define PLUGIN_SUFFIX ".plugin"
-'
+ _plugin_prefix=""
+ _plugin_suffix=".plugin"
+ CXXFLAGS="$CXXFLAGS -fpic"
+ LIBS="$LIBS -ldl"
_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX :=
-PLUGIN_SUFFIX := .plugin
PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
-CXXFLAGS += -DDYNAMIC_MODULES
-CXXFLAGS += -fpic
PLUGIN_LDFLAGS += -shared
PRE_OBJS_FLAGS := -Wl,-export-dynamic -Wl,-whole-archive
POST_OBJS_FLAGS := -Wl,-no-whole-archive
-LIBS += -ldl
'
;;
linux*)
-_def_plugin='
-#define PLUGIN_PREFIX "lib"
-#define PLUGIN_SUFFIX ".so"
-'
+ _plugin_prefix="lib"
+ _plugin_suffix=".so"
+ CXXFLAGS="$CXXFLAGS -fpic"
+ LIBS="$LIBS -ldl"
_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX := lib
-PLUGIN_SUFFIX := .so
PLUGIN_EXTRA_DEPS =
-CXXFLAGS += -DDYNAMIC_MODULES
-CXXFLAGS += -fpic
PLUGIN_LDFLAGS += -shared
PRE_OBJS_FLAGS := -Wl,-export-dynamic -Wl,-whole-archive
POST_OBJS_FLAGS := -Wl,-no-whole-archive
-LIBS += -ldl
'
;;
*mingw32*)
-_def_plugin='
-#define PLUGIN_PREFIX ""
-#define PLUGIN_SUFFIX ".dll"
-'
+ _plugin_prefix=""
+ _plugin_suffix=".dll"
_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX :=
-PLUGIN_SUFFIX := .dll
PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
-CXXFLAGS += -DDYNAMIC_MODULES
PLUGIN_LDFLAGS := -Wl,--enable-auto-import -shared ./libscummvm.a
PRE_OBJS_FLAGS := -Wl,--whole-archive
POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a
@@ -2323,16 +2516,10 @@ POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-im
wince)
DEFINES="$DEFINES -DUNCACHED_PLUGINS"
HOSTEXEEXT=".dll"
-_def_plugin='
-#define PLUGIN_PREFIX ""
-#define PLUGIN_SUFFIX ".dll"
-'
+ _plugin_prefix=""
+ _plugin_suffix=".plugin"
_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX :=
-PLUGIN_SUFFIX := .dll
PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
-CXXFLAGS += -DDYNAMIC_MODULES
PLUGIN_LDFLAGS := -shared -lscummvm -L.
PRE_OBJS_FLAGS := -Wl,--whole-archive
POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a -shared
@@ -2342,7 +2529,7 @@ POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-im
_elf_loader=yes
DEFINES="$DEFINES -DMIPS_TARGET"
_mak_plugins='
-LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T$(srcdir)/backends/plugins/ps2/main_prog.ld
+LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -Wl,-T$(srcdir)/backends/plugins/ps2/main_prog.ld
PLUGIN_LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -Wl,-T$(srcdir)/backends/plugins/ps2/plugin.ld -lstdc++ -lc
'
;;
@@ -2355,27 +2542,20 @@ PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/psp/plugin.ld -lstdc++ -lc
'
;;
webos)
-_def_plugin='
-#define PLUGIN_PREFIX "lib"
-#define PLUGIN_SUFFIX ".so"
-'
+ _plugin_prefix="lib"
+ _plugin_suffix=".so"
+ CXXFLAGS="$CXXFLAGS -fpic"
+ LIBS="$LIBS -ldl"
_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX := lib
-PLUGIN_SUFFIX := .so
PLUGIN_EXTRA_DEPS =
-CXXFLAGS += -DDYNAMIC_MODULES
-CXXFLAGS += -fpic
PLUGIN_LDFLAGS += -shared $(LDFLAGS)
PRE_OBJS_FLAGS := -Wl,-export-dynamic -Wl,-whole-archive
POST_OBJS_FLAGS := -Wl,-no-whole-archive
-LIBS += -ldl
'
;;
*)
_dynamic_modules=no
_mak_plugins=
- _def_plugin=
;;
esac
echo "$_dynamic_modules"
@@ -2387,15 +2567,9 @@ fi
define_in_config_if_yes "$_elf_loader" 'USE_ELF_LOADER'
if test "$_elf_loader" = yes; then
- CXXFLAGS="$CXXFLAGS -DDYNAMIC_MODULES"
- _def_plugin='
-#define PLUGIN_PREFIX ""
-#define PLUGIN_SUFFIX ".plg"
-'
+ _plugin_prefix=""
+ _plugin_suffix=".plg"
_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX :=
-PLUGIN_SUFFIX := .plg
PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
PLUGIN_LDFLAGS = -nostartfiles backends/plugins/elf/version.o -Wl,-q,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/plugins/elf/plugin.syms
PRE_OBJS_FLAGS := -Wl,--whole-archive
@@ -2404,6 +2578,19 @@ POST_OBJS_FLAGS := -Wl,--no-whole-archive
fi
#
+# Set up some common plugin settings in config.h and config.mk, if enabled
+#
+define_in_config_if_yes "$_dynamic_modules" 'DYNAMIC_MODULES'
+
+if test "$_dynamic_modules" = yes ; then
+ add_line_to_config_h "#define PLUGIN_PREFIX \"$_plugin_prefix\""
+ add_line_to_config_h "#define PLUGIN_SUFFIX \"$_plugin_suffix\""
+ add_line_to_config_mk "PLUGIN_PREFIX := $_plugin_prefix"
+ add_line_to_config_mk "PLUGIN_SUFFIX := $_plugin_suffix"
+fi
+
+
+#
# Check whether integrated MT-32 emulator support is requested
#
define_in_config_if_yes "$_mt32emu" 'USE_MT32EMU'
@@ -2424,28 +2611,6 @@ define_in_config_if_yes "$_build_scalers" 'USE_SCALERS'
define_in_config_if_yes "$_build_hq_scalers" 'USE_HQ_SCALERS'
#
-# Check whether to use optimized ARM asm
-#
-define_in_config_if_yes "$_arm_asm" 'USE_ARM_SCALER_ASM'
-define_in_config_if_yes "$_arm_asm" 'USE_ARM_SOUND_ASM'
-define_in_config_if_yes "$_arm_asm" 'USE_ARM_SMUSH_ASM'
-define_in_config_if_yes "$_arm_asm" 'USE_ARM_GFX_ASM'
-define_in_config_if_yes "$_arm_asm" 'USE_ARM_COSTUME_ASM'
-
-#
-# Check whether to compile the Indeo3 decoder
-#
-if test "$_indeo3" = auto ; then
- # Autodetect. Build if either the gob engine or plugins are enabled
- if test `get_engine_build gob` = yes || test "$_dynamic_modules" = yes ; then
- _indeo3=yes
- else
- _indeo3=no
- fi
-fi
-define_in_config_if_yes "$_indeo3" 'USE_INDEO3'
-
-#
# Check for math lib
#
cat > $TMPC << EOF
@@ -2628,14 +2793,33 @@ if test ! "$_theoradec" = notsupported ; then
fi
#
+# Check for the AAC decoder
+#
+echocheck "libfaad"
+if test "$_faad" = auto ; then
+ _faad=no
+ cat > $TMPC << EOF
+#include <neaacdec.h>
+int main(void) { NeAACDecGetCapabilities(); return 0; }
+EOF
+ cc_check $FAAD_CFLAGS $FAAD_LIBS -lfaad && _faad=yes
+fi
+if test "$_faad" = yes ; then
+ LIBS="$LIBS $FAAD_LIBS -lfaad"
+ INCLUDES="$INCLUDES $FAAD_CFLAGS"
+fi
+define_in_config_if_yes "$_faad" 'USE_FAAD'
+echo "$_faad"
+
+#
# Check for SEQ MIDI
#
echocheck "SEQ MIDI"
if test "$_seq_midi" = auto ; then
# TODO: Test for /dev/sequencer presence? Or maybe just for /dev ?
- # For now, we just always enable it when "unix" mode is on (backends
+ # For now, we just always enable it when "posix" mode is on (backends
# that do not want it can disable it by setting _seq_midi=no).
- _seq_midi="$_unix"
+ _seq_midi="$_posix"
fi
define_in_config_h_if_yes "$_seq_midi" 'USE_SEQ_MIDI'
echo "$_seq_midi"
@@ -2648,7 +2832,7 @@ if test "$_timidity" = auto ; then
# TODO: Is there a good possibility of auto detecting whether we
# should include TiMidity support? It can only be used on Unix
# currently so we use that as "detection" for now.
- _timidity="$_unix"
+ _timidity="$_posix"
fi
define_in_config_h_if_yes "$_timidity" 'USE_TIMIDITY'
echo "$_timidity"
@@ -2679,49 +2863,6 @@ if test `get_engine_build sword25` = yes && test ! "$_zlib" = yes ; then
fi
#
-# Check for LibMPEG2
-#
-echocheck "libmpeg2 >= 0.3.2"
-if test "$_mpeg2" = auto ; then
- _mpeg2=no
- cat > $TMPC << EOF
-typedef signed $type_1_byte int8_t;
-typedef signed $type_2_byte int16_t;
-typedef signed $type_4_byte int32_t;
-
-typedef unsigned $type_1_byte uint8_t;
-typedef unsigned $type_2_byte uint16_t;
-typedef unsigned $type_4_byte uint32_t;
-
-#include <mpeg2dec/mpeg2.h>
-int main(void) {
- /* mpeg2_state_t first appears in 0.4.0 */
- mpeg2_state_t state;
-
- #ifdef MPEG2_RELEASE
- if (MPEG2_RELEASE >= MPEG2_VERSION(0, 3, 2))
- return 0;
- #endif
- return 1;
-}
-EOF
-
- if test -n "$_host"; then
- # don't execute while cross compiling
- cc_check $MPEG2_CFLAGS $MPEG2_LIBS -lmpeg2 && _mpeg2=yes
- else
- cc_check_no_clean $MPEG2_CFLAGS $MPEG2_LIBS -lmpeg2 && $TMPO$HOSTEXEEXT && _mpeg2=yes
- cc_check_clean
- fi
-fi
-if test "$_mpeg2" = yes ; then
- INCLUDES="$INCLUDES $MPEG2_CFLAGS"
- LIBS="$LIBS $MPEG2_LIBS -lmpeg2"
-fi
-define_in_config_if_yes "$_mpeg2" 'USE_MPEG2'
-echo "$_mpeg2"
-
-#
# Check for libfluidsynth
#
echocheck "libfluidsynth"
@@ -2783,7 +2924,7 @@ if test "$_readline" = yes ; then
fi
define_in_config_h_if_yes "$_readline" 'USE_READLINE'
-define_in_config_h_if_yes "$_text_console" 'USE_TEXT_CONSOLE'
+define_in_config_h_if_yes "$_text_console" 'USE_TEXT_CONSOLE_FOR_DEBUGGER'
#
# Check for OpenGL (ES)
@@ -2869,6 +3010,7 @@ fi
define_in_config_if_yes "$_opengl" "USE_OPENGL"
define_in_config_if_yes "$_opengles" "USE_GLES"
+
#
# Check for nasm
#
@@ -2930,12 +3072,8 @@ define_in_config_if_yes $_nasm 'USE_NASM'
#
# Enable vkeybd / keymapper
#
-if test "$_vkeybd" = yes ; then
- DEFINES="$DEFINES -DENABLE_VKEYBD"
-fi
-if test "$_keymapper" = yes ; then
- DEFINES="$DEFINES -DENABLE_KEYMAPPER"
-fi
+define_in_config_if_yes $_vkeybd 'ENABLE_VKEYBD'
+define_in_config_if_yes $_keymapper 'ENABLE_KEYMAPPER'
# Check whether to build translation support
#
@@ -3017,10 +3155,6 @@ if test "$_mt32emu" = yes ; then
echo_n ", MT-32 emu"
fi
-if test "$_indeo3" = yes ; then
- echo_n ", Indeo3 decoder"
-fi
-
if test "$_text_console" = yes ; then
echo_n ", text console"
fi
@@ -3036,24 +3170,16 @@ else
fi
#
-# Backend related stuff
+# Some last-minute backend specific stuff, executed
+# after all of CXXFLAGS, LDFLAGS, LIBS etc. have been setup
#
case $_backend in
android)
- # ssp at this point so the cxxtests link
- if test "$_debug_build" = yes; then
- CXXFLAGS="$CXXFLAGS -fstack-protector"
- else
- CXXFLAGS="$CXXFLAGS -fno-stack-protector"
- fi
- CXXFLAGS="$CXXFLAGS -Wa,--noexecstack"
- LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-
static_libs=''
system_libs=''
for lib in $LIBS; do
case $lib in
- -lz|-lm)
+ -lz|-lm|-ldl)
system_libs="$system_libs $lib"
;;
*)
@@ -3065,167 +3191,15 @@ case $_backend in
# -lgcc is carefully placed here - we want to catch
# all toolchain symbols in *our* libraries rather
# than pick up anything unhygenic from the Android libs.
- LIBS="-Wl,-Bstatic $static_libs"
- LIBS="$LIBS -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM"
- DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
- ;;
- dc)
- INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include'
- LDFLAGS="$LDFLAGS -Wl,-Ttext,0x8c010000 -nostartfiles "'$(ronindir)/lib/crt0.o -L$(ronindir)/lib'
- LIBS="$LIBS -lronin -lm"
- ;;
- dingux)
- find_sdlconfig
- INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
- LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
- DEFINES="$DEFINES -DSDL_BACKEND -DDINGUX"
- LDFLAGS="$LDFLAGS "
- MODULES="$MODULES backends/platform/sdl"
- ;;
- ds)
- # TODO ds
- INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source'
- INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude'
- INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
- ;;
- gp2x)
- find_sdlconfig
- INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
- LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
- LDFLAGS="$LDFLAGS"
- DEFINES="$DEFINES -DSDL_BACKEND"
- ;;
- gph)
- find_sdlconfig
- INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
- LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
- LDFLAGS="$LDFLAGS"
- DEFINES="$DEFINES -DSDL_BACKEND"
- ;;
- iphone)
- OBJCFLAGS="$OBJCFLAGS --std=c99"
- LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES -framework QuartzCore -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio"
- ;;
- linuxmoto)
- find_sdlconfig
- INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
- LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
- DEFINES="$DEFINES -DSDL_BACKEND -DLINUXMOTO"
+ LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM"
;;
n64)
- INCLUDES="$INCLUDES "'-I$(N64SDK)/include'
- INCLUDES="$INCLUDES "'-I$(N64SDK)/mips64/include'
- INCLUDES="$INCLUDES "'-I$(N64SDK)/hkz-libn64'
- INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/n64'
- LIBS="$LIBS -lpakfs -lframfs -ln64 -ln64utils -lromfs -lm -lstdc++ -lc -lgcc -lz -lnosys"
- ;;
- null)
- DEFINES="$DEFINES -DUSE_NULL_DRIVER"
- ;;
- openpandora)
- find_sdlconfig
- INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
- LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
- LDFLAGS="$LDFLAGS"
- DEFINES="$DEFINES -DSDL_BACKEND"
- ;;
- ps2)
- # TODO ps2
- DEFINES="$DEFINES -D_EE -DFORCE_RTL"
- INCLUDES="$INCLUDES -I$PS2SDK/ee/include -I$PS2SDK/common/include -I$PS2SDK/ports/include"
- if test "$_dynamic_modules" = no ; then
- LDFLAGS="$LDFLAGS -mno-crt0 $PS2SDK/ee/startup/crt0.o -T $PS2SDK/ee/startup/linkfile"
- fi
- LDFLAGS="$LDFLAGS -L$PS2SDK/ee/lib -L$PS2SDK/ports/lib"
- LIBS="$LIBS -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lm -lc -lfileXio -lkernel -lstdc++ "
- ;;
- psp)
- DEFINES="$DEFINES -D__PSP__ -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
- LIBS="$LIBS -lpng -Wl,-Map,mapfile.txt"
- ;;
- samsungtv)
- find_sdlconfig
- INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
- LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
- DEFINES="$DEFINES -DSDL_BACKEND -DSAMSUNGTV"
- LDFLAGS="$LDFLAGS -shared -fpic"
- MODULES="$MODULES backends/platform/sdl"
- ;;
- sdl)
- find_sdlconfig
- INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
- LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
- DEFINES="$DEFINES -DSDL_BACKEND"
- ;;
- webos)
- # There is no sdl-config in the WebOS PDK so we don't use find_sdlconfig here.
- LIBS="$LIBS -lSDL"
- DEFINES="$DEFINES -DSDL_BACKEND -DWEBOS"
- MODULES="$MODULES backends/platform/sdl"
- ;;
- wii)
- DEFINES="$DEFINES -D__WII__ -DGEKKO"
- case $_host_os in
- gamecube)
- LIBS="$LIBS -lgxflux -liso9660 -lfat -logc -ldb"
- ;;
- *)
- LIBS="$LIBS -lgxflux -ldi -liso9660 -ltinysmb -lfat -lwiiuse -lbte -logc -lwiikeyboard -ldb"
- ;;
- esac
- ;;
- wince)
- INCLUDES="$INCLUDES "'-I$(srcdir) -I$(srcdir)/backends/platform/wince -I$(srcdir)/engines -I$(srcdir)/backends/platform/wince/missing/gcc -I$(srcdir)/backends/platform/wince/CEgui -I$(srcdir)/backends/platform/wince/CEkeys'
- LIBS="$LIBS -static -lSDL"
- DEFINES="$DEFINES -DSDL_BACKEND"
- ;;
- *)
- echo "support for $_backend backend not implemented in configure script yet"
- exit 1
+ # Move some libs down here, otherwise some symbols requires by libvorbis aren't found
+ # during linking stage
+ LIBS="$LIBS -lc -lgcc -lnosys"
;;
esac
-MODULES="$MODULES backends/platform/$_backend"
-
-#
-# Do CXXFLAGS now that we know the compiler version
-#
-if test "$have_gcc" = yes ; then
- if test "$_cxx_major" -ge "3" ; then
- case $_host_os in
- # newlib-based system include files suppress non-C89 function
- # declarations under __STRICT_ANSI__
- amigaos* | android | dreamcast | ds | gamecube | mingw* | n64 | psp | ps2 | wii | wince )
- CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
- ;;
- *)
- CXXFLAGS="$CXXFLAGS -ansi -W -Wno-unused-parameter"
- ;;
- esac
- add_line_to_config_mk 'HAVE_GCC3 = 1'
- add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
- fi;
- if test "$_cxx_major" -eq 4 && test "$_cxx_minor" -ge 3 || \
- test "$_cxx_major" -gt 4 ; then
- CXXFLAGS="$CXXFLAGS -Wno-empty-body"
- else
- CXXFLAGS="$CXXFLAGS -Wconversion"
- fi;
-elif test "$have_icc" = yes ; then
- add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
-fi;
-
-# Some platforms use certain GNU extensions in header files
-case $_host_os in
-android | gamecube | psp | wii)
- ;;
-*)
- # ICC does not support pedantic
- if test "$have_icc" = no ; then
- CXXFLAGS="$CXXFLAGS -pedantic"
- fi
- ;;
-esac
#
# Engine selection
@@ -3328,9 +3302,6 @@ typedef signed $type_1_byte int8;
typedef signed $type_2_byte int16;
typedef signed $type_4_byte int32;
-/* Plugin settings */
-$_def_plugin
-
#endif /* CONFIG_H */
EOF
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 12:51:51 +0000