From 40a6c232e9169a9cfe0d6a698b728c8565cd8959 Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Thu, 14 Jul 2011 20:08:06 +0200 Subject: COMPOSER: Add a first attempt at an engine. --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index 74541e3d98..b161c5a81e 100755 --- a/configure +++ b/configure @@ -84,6 +84,7 @@ add_engine agi "AGI" yes add_engine agos "AGOS" yes "agos2" add_engine agos2 "AGOS 2 games" yes add_engine cine "Cinematique evo 1" yes +add_engine composer "Magic Composer" no add_engine cruise "Cinematique evo 2" yes add_engine draci "Dragon History" yes add_engine drascula "Drascula: The Vampire Strikes Back" yes -- cgit v1.2.3 From 828f1884b463c49eb39b7f63def0e4bda15d11c6 Mon Sep 17 00:00:00 2001 From: CeRiAl Date: Sun, 3 Jul 2011 23:01:17 +0200 Subject: MACOSX: Add Sparkle support --- configure | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 9ec277bf60..3f062b964c 100755 --- a/configure +++ b/configure @@ -134,6 +134,7 @@ _alsa=auto _seq_midi=auto _timidity=auto _zlib=auto +_sparkle=auto _png=auto _theoradec=auto _faad=auto @@ -813,6 +814,9 @@ Optional Libraries: installed (optional) --disable-fluidsynth disable fluidsynth MIDI driver [autodetect] + --with-sparkle-prefix=DIR Prefix where sparkle is installed (MacOSX only - optional) + --disable-sparkle disable sparkle automatic update support [MacOSX only - autodetect] + --with-sdl-prefix=DIR Prefix where the sdl-config script is installed (optional) @@ -861,6 +865,8 @@ for ac_option in $@; do --disable-mad) _mad=no ;; --enable-zlib) _zlib=yes ;; --disable-zlib) _zlib=no ;; + --enable-sparkle) _sparkle=yes ;; + --disable-sparkle) _sparkle=no ;; --enable-nasm) _nasm=yes ;; --disable-nasm) _nasm=no ;; --disable-png) _png=no ;; @@ -948,6 +954,11 @@ for ac_option in $@; do ZLIB_CFLAGS="-I$arg/include" ZLIB_LIBS="-L$arg/lib" ;; + --with-sparkle-prefix=*) + arg=`echo $ac_option | cut -d '=' -f 2` + SPARKLE_CFLAGS="-F$arg" + SPARKLE_LIBS="-F$arg" + ;; --with-readline-prefix=*) arg=`echo $ac_option | cut -d '=' -f 2` READLINE_CFLAGS="-I$arg/include" @@ -2970,6 +2981,26 @@ if test `get_engine_build sword25` = yes && test ! "$_zlib" = yes ; then engine_disable sword25 fi +# +# Check for Sparkle +# +echocheck "Sparkle" +if test "$_sparkle" = auto ; then + _sparkle=no + cat > $TMPC << EOF +#include +#include +int main(void) { SUUpdater *updater = [SUUpdater sharedUpdater]; return 0; } +EOF + cc_check $SPARKLE_CFLAGS $SPARKLE_LIBS -framework Sparkle -ObjC++ -lobjc && _sparkle=yes +fi +if test "$_sparkle" = yes ; then + LIBS="$LIBS $SPARKLE_LIBS -framework Sparkle" + INCLUDES="$INCLUDES $SPARKLE_CFLAGS" +fi +define_in_config_if_yes "$_sparkle" 'USE_SPARKLE' +echo "$_sparkle" + # # Check for libfluidsynth # -- cgit v1.2.3 From f60d6f7a9776253ad4716eb8a72fba18c91a7588 Mon Sep 17 00:00:00 2001 From: CeRiAl Date: Thu, 7 Jul 2011 02:47:46 +0200 Subject: MACOSX/UPDATES: Streamline UpdateManager Moved UpdateManager related code from backends/modular-backend.* to common/system.*. Added switch --enable/disable-updates to be able to disable updates support generally. --- configure | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 3f062b964c..1a449fd6e9 100755 --- a/configure +++ b/configure @@ -143,6 +143,7 @@ _opengl=auto _opengles=auto _readline=auto _taskbar=yes +_updates=yes _libunity=auto # Default option behaviour yes/no _debug_build=auto @@ -773,6 +774,7 @@ Optional Features: --disable-hq-scalers exclude HQ2x and HQ3x scalers --disable-translation don't build support for translated messages --disable-taskbar don't build support for taskbar and launcher integration + --disable-updates don't build support for updates --enable-text-console use text console instead of graphical console --enable-verbose-build enable regular echoing of commands during build process @@ -880,6 +882,8 @@ for ac_option in $@; do --disable-readline) _readline=no ;; --enable-taskbar) _taskbar=yes ;; --disable-taskbar) _taskbar=no ;; + --enable-updates) _updates=yes ;; + --disable-updates) _updates=no ;; --enable-libunity) _libunity=yes ;; --disable-libunity) _libunity=no ;; --enable-opengl) _opengl=yes ;; @@ -2982,9 +2986,12 @@ if test `get_engine_build sword25` = yes && test ! "$_zlib" = yes ; then fi # -# Check for Sparkle +# Check for Sparkle if updates support is enabled # echocheck "Sparkle" +if test "$_updates" = no; then + _sparkle=no +else if test "$_sparkle" = auto ; then _sparkle=no cat > $TMPC << EOF @@ -2999,6 +3006,7 @@ if test "$_sparkle" = yes ; then INCLUDES="$INCLUDES $SPARKLE_CFLAGS" fi define_in_config_if_yes "$_sparkle" 'USE_SPARKLE' +fi echo "$_sparkle" # @@ -3307,6 +3315,21 @@ echo_n "Building Bink video support... " define_in_config_if_yes $_bink 'USE_BINK' echo "$_bink" +# +# Check whether to build updates support +# +echo_n "Building updates support... " +define_in_config_if_yes $_updates 'USE_UPDATES' +if test "$_updates" = yes; then + if test "$_sparkle" = yes; then + echo "Sparkle" + else + echo "$_updates" + fi +else + echo "$_updates" +fi + # # Figure out installation directories # -- cgit v1.2.3 From 7e7e6069193fead17d0865d252400b6826805ffc Mon Sep 17 00:00:00 2001 From: Oystein Eftevaag Date: Tue, 2 Aug 2011 21:00:57 -0400 Subject: MACOSX: Turned update support off by default, simplified and cleaned the pull request --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 8045a8b52b..2221c85041 100755 --- a/configure +++ b/configure @@ -144,7 +144,7 @@ _opengl=auto _opengles=auto _readline=auto _taskbar=yes -_updates=yes +_updates=no _libunity=auto # Default option behaviour yes/no _debug_build=auto @@ -775,7 +775,7 @@ Optional Features: --disable-hq-scalers exclude HQ2x and HQ3x scalers --disable-translation don't build support for translated messages --disable-taskbar don't build support for taskbar and launcher integration - --disable-updates don't build support for updates + --enable-updates build support for updates --enable-text-console use text console instead of graphical console --enable-verbose-build enable regular echoing of commands during build process -- cgit v1.2.3 From de0fac3121266692a46f310b173e4686533e6a85 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 4 Aug 2011 21:00:45 +1000 Subject: BUILD: Enable Ringworld: Revenge Of The Patriarch by default. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 2221c85041..3f02e267cd 100755 --- a/configure +++ b/configure @@ -119,7 +119,7 @@ add_engine testbed "TestBed: the Testing framework" no add_engine tinsel "Tinsel" yes add_engine toon "Toonstruck" yes add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes -add_engine tsage "Ringworld: Revenge Of The Patriarch" no +add_engine tsage "Ringworld: Revenge Of The Patriarch" yes add_engine tucker "Bud Tucker in Double Trouble" yes # -- cgit v1.2.3 From d6e0afc00277ea17193235ae17219f4a72c55e0f Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 12 Jul 2011 11:28:47 +0200 Subject: CONFIGURE: Unify cpu arch detection --- configure | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 3f02e267cd..17255451db 100755 --- a/configure +++ b/configure @@ -193,7 +193,6 @@ _posix=no _endian=unknown _need_memalign=yes _have_x86=no -_arm_asm=no @@ -1686,38 +1685,37 @@ echo "$_need_memalign" define_in_config_h_if_yes $_need_memalign 'SCUMM_NEED_ALIGNMENT' # -# Check whether we can use x86 asm routines +# Check the CPU architecture # -echo_n "Compiling for x86... " +echo_n "Checking host CPU architecture... " case $_host_cpu in - i386|i486|i586|i686) + arm*) + echo "ARM" + define_in_config_if_yes yes 'USE_ARM_SCALER_ASM' + define_in_config_if_yes yes 'USE_ARM_SOUND_ASM' + define_in_config_if_yes yes 'USE_ARM_SMUSH_ASM' + define_in_config_if_yes yes 'USE_ARM_GFX_ASM' + define_in_config_if_yes yes 'USE_ARM_COSTUME_ASM' + + DEFINES="$DEFINES -DARM_TARGET" + ;; + i[3-6]86) + echo "x86" _have_x86=yes + define_in_config_h_if_yes $_have_x86 'HAVE_X86' ;; - *) - _have_x86=no + mips*) + echo "MIPS" + DEFINES="$DEFINES -DMIPS_TARGET" ;; -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 + ppc*) + echo "PowerPC" + DEFINES="$DEFINES -DPPC_TARGET" ;; *) - _arm_asm=no + echo "unknown ($_host_cpu)" ;; 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' # @@ -2580,7 +2578,9 @@ POST_OBJS_FLAGS := -Wl,--no-whole-archive ;; ds) _elf_loader=yes - DEFINES="$DEFINES -DARM_TARGET -DELF_LOADER_CXA_ATEXIT -DUNCACHED_PLUGINS -DELF_NO_MEM_MANAGER" + DEFINES="$DEFINES -DELF_LOADER_CXA_ATEXIT" + DEFINES="$DEFINES -DUNCACHED_PLUGINS" + DEFINES="$DEFINES -DELF_NO_MEM_MANAGER" _mak_plugins=' PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/ds/plugin.ld -mthumb-interwork -mno-fpu ' @@ -2598,7 +2598,8 @@ POST_OBJS_FLAGS := -Wl,-no-whole-archive ;; gamecube | wii) _elf_loader=yes - DEFINES="$DEFINES -DPPC_TARGET -DELF_LOADER_CXA_ATEXIT -DUNCACHED_PLUGINS" + DEFINES="$DEFINES -DELF_LOADER_CXA_ATEXIT" + DEFINES="$DEFINES -DUNCACHED_PLUGINS" _mak_plugins=' PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/wii/plugin.ld ' @@ -2651,7 +2652,6 @@ POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-im ;; ps2) _elf_loader=yes - DEFINES="$DEFINES -DMIPS_TARGET" _mak_plugins=' 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 @@ -2659,7 +2659,7 @@ PLUGIN_LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -Wl,-T$(srcdir)/backend ;; psp) _elf_loader=yes - DEFINES="$DEFINES -DMIPS_TARGET -DUNCACHED_PLUGINS" + DEFINES="$DEFINES -DUNCACHED_PLUGINS" _mak_plugins=' LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/psp/main_prog.ld PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/psp/plugin.ld -lstdc++ -lc -- cgit v1.2.3 From 6a7c87b4a472c8fe7b3ddbaab992f25320f6a14c Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 8 Aug 2011 20:36:06 +0200 Subject: CONFIGURE: Add x86_64 to the CPU architecture list. This prevents it from shown as "unknown (x86_64)", even though it is an officially supported platform. --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 17255451db..d2e2aa903b 100755 --- a/configure +++ b/configure @@ -1696,7 +1696,7 @@ case $_host_cpu in define_in_config_if_yes yes 'USE_ARM_SMUSH_ASM' define_in_config_if_yes yes 'USE_ARM_GFX_ASM' define_in_config_if_yes yes 'USE_ARM_COSTUME_ASM' - + DEFINES="$DEFINES -DARM_TARGET" ;; i[3-6]86) @@ -1712,6 +1712,9 @@ case $_host_cpu in echo "PowerPC" DEFINES="$DEFINES -DPPC_TARGET" ;; + x86_64) + echo "x86_64" + ;; *) echo "unknown ($_host_cpu)" ;; -- cgit v1.2.3 From 53ea7bfe3477ab53d772d53d9b43e971296597d4 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 8 Aug 2011 12:38:29 +0100 Subject: CONFIGURE: Add more verbosity for slow shell environments like mingw --- configure | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'configure') diff --git a/configure b/configure index d2e2aa903b..3e0b84f8a2 100755 --- a/configure +++ b/configure @@ -3454,6 +3454,15 @@ _engines_built_static="" _engines_built_dynamic="" _engines_skipped="" +# Show a message if looping over engines takes longer than 5 secs +sh -c " + touch config.gnomes + sleep 5 + if test -f config.gnomes; then + printf 'Employing little gnomes...' + rm -f config.gnomes + fi" 2>/dev/null & + for engine in $_engines; do if test "`get_engine_sub $engine`" = "no" ; then # It's a main engine @@ -3518,6 +3527,14 @@ done add_to_config_h_if_yes `get_var _tainted_build` '#define TAINTED_BUILD' +# Complete the message on slow systems +if test -f config.gnomes ; then + # Kill does not work well here as it produces nasty 'Killed' message + rm -rf config.gnomes +else + echo " work is done" +fi + # # Show which engines ("frontends") are to be built # -- cgit v1.2.3 From 077a2f8fb024e7f3673d6164a61ce6fd511ce41b Mon Sep 17 00:00:00 2001 From: Ori Avtalion Date: Mon, 8 Aug 2011 22:09:48 +0300 Subject: JANITORIAL: Remove trailing whitespace --- configure | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 3e0b84f8a2..41166d25ab 100755 --- a/configure +++ b/configure @@ -1156,12 +1156,12 @@ ps3) _host_os=ps3 _host_cpu=ppc _host_alias=powerpc64-ps3-elf - + # The prefix is always the same on PS3 so we hardcode the default # here. It is still possible to define a custom prefix which is # needed when packaging the app with a user-specific app ID. test "x$prefix" = xNONE && prefix=/dev_hdd0/game/SCUM12000/USRDIR - # PS3 apps are installed into app-specific directories. The + # PS3 apps are installed into app-specific directories. The # default directory structure of ScummVM makes no sense here so we # hardcode PS3 specific directories here. datarootdir='${prefix}/data' @@ -1186,7 +1186,7 @@ webos) # here. It is still possible to define a custom prefix which is # needed when packaging the app with a user-specific app ID. test "x$prefix" = xNONE && prefix=/media/cryptofs/apps/usr/palm/applications/org.scummvm.scummvm - # WebOS apps are installed into app-specific directories. The + # WebOS apps are installed into app-specific directories. The # default directory structure of ScummVM makes no sense here so we # hardcode WebOS specific directories here. datarootdir='${prefix}/data' @@ -1902,7 +1902,7 @@ case $_host_os in ps3) # Force use of SDL from the ps3 toolchain _sdlpath="$PS3DEV/portlibs/ppu:$PS3DEV/portlibs/ppu/bin" - + DEFINES="$DEFINES -DPLAYSTATION3" CXXFLAGS="$CXXFLAGS -mcpu=cell -mminimal-toc -I$PS3DEV/psl1ght/ppu/include -I$PS3DEV/portlibs/ppu/include" LDFLAGS="$LDFLAGS -L$PS3DEV/psl1ght/ppu/lib -L$PS3DEV/portlibs/ppu/lib" @@ -2098,7 +2098,7 @@ if test -n "$_host"; then ;; gp2x) # This uses the GPH backend. - DEFINES="$DEFINES -DGPH_DEVICE" + DEFINES="$DEFINES -DGPH_DEVICE" DEFINES="$DEFINES -DGP2X" DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE" if test "$_debug_build" = yes; then @@ -3440,7 +3440,7 @@ case $_backend in LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM" ;; n64) - # Move some libs down here, otherwise some symbols requires by libvorbis aren't found + # Move some libs down here, otherwise some symbols requires by libvorbis aren't found # during linking stage LIBS="$LIBS -lc -lgcc -lnosys" ;; @@ -3458,7 +3458,7 @@ _engines_skipped="" sh -c " touch config.gnomes sleep 5 - if test -f config.gnomes; then + if test -f config.gnomes; then printf 'Employing little gnomes...' rm -f config.gnomes fi" 2>/dev/null & -- cgit v1.2.3 From 59739a7a0e3e4826ba7b27d5270a8d7a26b787ef Mon Sep 17 00:00:00 2001 From: Chris Warren-Smith Date: Sun, 7 Aug 2011 21:33:32 +1000 Subject: BADA: Initial BADA port implementation --- configure | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 41166d25ab..c4d6bc116b 100755 --- a/configure +++ b/configure @@ -705,7 +705,7 @@ Usage: $0 [OPTIONS]... Configuration: -h, --help display this help and exit - --backend=BACKEND backend to build (android, dc, dingux, ds, gp2x, gph, + --backend=BACKEND backend to build (android, bada, dc, dingux, ds, gp2x, gph, iphone, linuxmoto, maemo, n64, null, openpandora, ps2, psp, samsungtv, sdl, webos, wii, wince) [sdl] @@ -734,6 +734,7 @@ Fine tuning of the installation directories: Special configuration feature: --host=HOST cross-compile to target HOST (arm-linux, ...) special targets: android for Android + bada for Samsung BADA caanoo for Caanoo dingux for Dingux dreamcast for Sega Dreamcast @@ -1069,6 +1070,16 @@ arm-riscos) _host_os=riscos _host_cpu=arm ;; +bada) + _host_os=bada + if test "$_debug_build" = yes; then + _host_cpu=i686 + _host_alias=i686-mingw32 + else + _host_cpu=arm + _host_alias=arm-samsung-nucleuseabi + fi + ;; caanoo) _host_os=gph-linux _host_cpu=arm @@ -1291,6 +1302,12 @@ android) exit 1 fi ;; +bada) + if test -z "$BADA_SDK"; then + echo "Please set BADA_SDK in your environment. export BADA_SDK=" + exit 1 + fi + ;; ds | gamecube | wii) if test -z "$DEVKITPRO"; then echo "Please set DEVKITPRO in your environment. export DEVKITPRO=" @@ -1507,7 +1524,7 @@ if test "$have_gcc" = yes ; 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 | ps3 | wii | wince ) + amigaos* | android | bada | dreamcast | ds | gamecube | mingw* | n64 | psp | ps2 | ps3 | wii | wince ) ;; *) CXXFLAGS="$CXXFLAGS -ansi" @@ -1775,6 +1792,16 @@ case $_host_os in add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK" _seq_midi=no ;; + bada) + BADA_SDK_ROOT="`cygpath.exe -m ${BADA_SDK}`" + add_line_to_config_mk "BADA_SDK = $BADA_SDK" + add_line_to_config_mk "BADA_SDK_ROOT = $BADA_SDK_ROOT" + + # assume dependencies have been installed in cygwin's /usr/local + CYGWIN_USR_LOCAL="`cygpath.exe -m /usr/local`" + LDFLAGS="$LDFLAGS -L${CYGWIN_USR_LOCAL}/lib" + CXXFLAGS="$CXXFLAGS -I${CYGWIN_USR_LOCAL}/include" + ;; beos*) DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE" # Needs -lbind -lsocket for the timidity MIDI driver @@ -2001,6 +2028,22 @@ if test -n "$_host"; then arm-riscos|linupy) DEFINES="$DEFINES -DLINUPY" ;; + bada) + _unix=yes + _backend="bada" + _port_mk="backends/platform/bada/bada.mk" + if test "$_debug_build" = yes; then + _arm_asm=no + else + _arm_asm=yes + fi + _taskbar=no + _build_scalers=no + _seq_midi=no + _mt32emu=no + _timidity=no + _vkeybd=yes + ;; bfin*) ;; caanoo) @@ -2334,6 +2377,34 @@ case $_backend in CXXFLAGS="$CXXFLAGS -Wa,--noexecstack" LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" ;; + bada) + # dirent.h not available. NONSTANDARD_PORT==ensure portdefs.h is included + DEFINES="$DEFINES -DBADA -DDISABLE_STDIO_FILESTREAM -DNONSTANDARD_PORT" + DEFINES="$DEFINES -DNO_STDERR_STDOUT" + DEFINES="$DEFINES -DDISABLE_COMMAND_LINE" + INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/bada ' + INCLUDES="$INCLUDES "'-I$(BADA_SDK)/include' + INCLUDES="$INCLUDES "'-I$(BADA_SDK_ROOT)/Include' + if test "$_debug_build" = yes; then + # debug using with the simulator + CXXFLAGS="$CXXFLAGS -D_DEBUG -DSHP -DBUILD_DLL -fmessage-length=0" + else + # created a shared library for inclusion via the eclipse build + CXXFLAGS="$CXXFLAGS -DSHP" + CXXFLAGS="$CXXFLAGS -fpic" + CXXFLAGS="$CXXFLAGS -fshort-wchar" + CXXFLAGS="$CXXFLAGS -mcpu=cortex-a8" + CXXFLAGS="$CXXFLAGS -mfpu=vfpv3" + CXXFLAGS="$CXXFLAGS -mfloat-abi=hard" + CXXFLAGS="$CXXFLAGS -mlittle-endian" + CXXFLAGS="$CXXFLAGS -mthumb-interwork" + CXXFLAGS="$CXXFLAGS -Wno-psabi" + CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + CXXFLAGS="$CXXFLAGS -fno-short-enums" + fi + HOSTEXEPRE=lib + HOSTEXEEXT=.a + ;; dc) INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc' INCLUDES="$INCLUDES "'-isystem $(ronindir)/include' @@ -2473,7 +2544,7 @@ esac # Enable 16bit support only for backends which support it # case $_backend in - android | dingux | dreamcast | gph | openpandora | psp | samsungtv | sdl | webos | wii) + android | bada | dingux | dreamcast | gph | openpandora | psp | samsungtv | sdl | webos | wii) if test "$_16bit" = auto ; then _16bit=yes else @@ -3189,6 +3260,14 @@ EOF fi fi +case $_host_os in + bada) + # components live in non-standard locations so just assume sane SDK + _opengl=yes + _opengles=yes + ;; +esac + if test "$_opengles" = "yes" ; then echo "yes (OpenGL ES)" else -- cgit v1.2.3 From a31b74f3e98a083c8d5e20facf06d126b9504c76 Mon Sep 17 00:00:00 2001 From: Chris Warren-Smith Date: Tue, 16 Aug 2011 11:58:43 +1000 Subject: BADA: Code formatting and style changes following review --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index c4d6bc116b..bdbe9ef1da 100755 --- a/configure +++ b/configure @@ -1793,12 +1793,12 @@ case $_host_os in _seq_midi=no ;; bada) - BADA_SDK_ROOT="`cygpath.exe -m ${BADA_SDK}`" + BADA_SDK_ROOT="`cygpath -m ${BADA_SDK}`" add_line_to_config_mk "BADA_SDK = $BADA_SDK" add_line_to_config_mk "BADA_SDK_ROOT = $BADA_SDK_ROOT" # assume dependencies have been installed in cygwin's /usr/local - CYGWIN_USR_LOCAL="`cygpath.exe -m /usr/local`" + CYGWIN_USR_LOCAL="`cygpath -m /usr/local`" LDFLAGS="$LDFLAGS -L${CYGWIN_USR_LOCAL}/lib" CXXFLAGS="$CXXFLAGS -I${CYGWIN_USR_LOCAL}/include" ;; -- cgit v1.2.3 From 7b9346d42b3f447d49fe565d10c66ada341477c8 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 26 Aug 2011 17:04:53 +0100 Subject: CONFIGURE: Fix indentation --- configure | 110 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) (limited to 'configure') diff --git a/configure b/configure index bdbe9ef1da..b9ccb67e1a 100755 --- a/configure +++ b/configure @@ -1072,12 +1072,12 @@ arm-riscos) ;; bada) _host_os=bada - if test "$_debug_build" = yes; then - _host_cpu=i686 - _host_alias=i686-mingw32 - else - _host_cpu=arm - _host_alias=arm-samsung-nucleuseabi + if test "$_debug_build" = yes; then + _host_cpu=i686 + _host_alias=i686-mingw32 + else + _host_cpu=arm + _host_alias=arm-samsung-nucleuseabi fi ;; caanoo) @@ -1793,12 +1793,12 @@ case $_host_os in _seq_midi=no ;; bada) - BADA_SDK_ROOT="`cygpath -m ${BADA_SDK}`" - add_line_to_config_mk "BADA_SDK = $BADA_SDK" - add_line_to_config_mk "BADA_SDK_ROOT = $BADA_SDK_ROOT" + BADA_SDK_ROOT="`cygpath -m ${BADA_SDK}`" + add_line_to_config_mk "BADA_SDK = $BADA_SDK" + add_line_to_config_mk "BADA_SDK_ROOT = $BADA_SDK_ROOT" - # assume dependencies have been installed in cygwin's /usr/local - CYGWIN_USR_LOCAL="`cygpath -m /usr/local`" + # assume dependencies have been installed in cygwin's /usr/local + CYGWIN_USR_LOCAL="`cygpath -m /usr/local`" LDFLAGS="$LDFLAGS -L${CYGWIN_USR_LOCAL}/lib" CXXFLAGS="$CXXFLAGS -I${CYGWIN_USR_LOCAL}/include" ;; @@ -2029,21 +2029,21 @@ if test -n "$_host"; then DEFINES="$DEFINES -DLINUPY" ;; bada) - _unix=yes - _backend="bada" - _port_mk="backends/platform/bada/bada.mk" - if test "$_debug_build" = yes; then - _arm_asm=no - else - _arm_asm=yes - fi - _taskbar=no - _build_scalers=no - _seq_midi=no - _mt32emu=no - _timidity=no + _unix=yes + _backend="bada" + _port_mk="backends/platform/bada/bada.mk" + if test "$_debug_build" = yes; then + _arm_asm=no + else + _arm_asm=yes + fi + _taskbar=no + _build_scalers=no + _seq_midi=no + _mt32emu=no + _timidity=no _vkeybd=yes - ;; + ;; bfin*) ;; caanoo) @@ -2378,33 +2378,33 @@ case $_backend in LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" ;; bada) - # dirent.h not available. NONSTANDARD_PORT==ensure portdefs.h is included - DEFINES="$DEFINES -DBADA -DDISABLE_STDIO_FILESTREAM -DNONSTANDARD_PORT" - DEFINES="$DEFINES -DNO_STDERR_STDOUT" + # dirent.h not available. NONSTANDARD_PORT==ensure portdefs.h is included + DEFINES="$DEFINES -DBADA -DDISABLE_STDIO_FILESTREAM -DNONSTANDARD_PORT" + DEFINES="$DEFINES -DNO_STDERR_STDOUT" DEFINES="$DEFINES -DDISABLE_COMMAND_LINE" - INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/bada ' - INCLUDES="$INCLUDES "'-I$(BADA_SDK)/include' - INCLUDES="$INCLUDES "'-I$(BADA_SDK_ROOT)/Include' - if test "$_debug_build" = yes; then - # debug using with the simulator - CXXFLAGS="$CXXFLAGS -D_DEBUG -DSHP -DBUILD_DLL -fmessage-length=0" - else - # created a shared library for inclusion via the eclipse build - CXXFLAGS="$CXXFLAGS -DSHP" - CXXFLAGS="$CXXFLAGS -fpic" - CXXFLAGS="$CXXFLAGS -fshort-wchar" - CXXFLAGS="$CXXFLAGS -mcpu=cortex-a8" - CXXFLAGS="$CXXFLAGS -mfpu=vfpv3" - CXXFLAGS="$CXXFLAGS -mfloat-abi=hard" - CXXFLAGS="$CXXFLAGS -mlittle-endian" - CXXFLAGS="$CXXFLAGS -mthumb-interwork" - CXXFLAGS="$CXXFLAGS -Wno-psabi" - CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" - CXXFLAGS="$CXXFLAGS -fno-short-enums" - fi - HOSTEXEPRE=lib - HOSTEXEEXT=.a - ;; + INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/bada ' + INCLUDES="$INCLUDES "'-I$(BADA_SDK)/include' + INCLUDES="$INCLUDES "'-I$(BADA_SDK_ROOT)/Include' + if test "$_debug_build" = yes; then + # debug using with the simulator + CXXFLAGS="$CXXFLAGS -D_DEBUG -DSHP -DBUILD_DLL -fmessage-length=0" + else + # created a shared library for inclusion via the eclipse build + CXXFLAGS="$CXXFLAGS -DSHP" + CXXFLAGS="$CXXFLAGS -fpic" + CXXFLAGS="$CXXFLAGS -fshort-wchar" + CXXFLAGS="$CXXFLAGS -mcpu=cortex-a8" + CXXFLAGS="$CXXFLAGS -mfpu=vfpv3" + CXXFLAGS="$CXXFLAGS -mfloat-abi=hard" + CXXFLAGS="$CXXFLAGS -mlittle-endian" + CXXFLAGS="$CXXFLAGS -mthumb-interwork" + CXXFLAGS="$CXXFLAGS -Wno-psabi" + CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + CXXFLAGS="$CXXFLAGS -fno-short-enums" + fi + HOSTEXEPRE=lib + HOSTEXEEXT=.a + ;; dc) INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc' INCLUDES="$INCLUDES "'-isystem $(ronindir)/include' @@ -3262,10 +3262,10 @@ fi case $_host_os in bada) - # components live in non-standard locations so just assume sane SDK - _opengl=yes - _opengles=yes - ;; + # components live in non-standard locations so just assume sane SDK + _opengl=yes + _opengles=yes + ;; esac if test "$_opengles" = "yes" ; then -- cgit v1.2.3 From 8d229796674b4760da1a3532b16f05b5f0c68761 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 26 Aug 2011 17:41:09 +0100 Subject: CONFIGURE: Add support for building under MacPorts --- configure | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'configure') diff --git a/configure b/configure index b9ccb67e1a..eca9005b8a 100755 --- a/configure +++ b/configure @@ -1819,6 +1819,26 @@ case $_host_os in DEFINES="$DEFINES -DMACOSX" LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI" add_line_to_config_mk 'MACOSX = 1' + + # Now we may have MacPorts or Fink installed + # Which put libraries and headers in non-standard places + # Checking them here + + # MacPorts + # There is no way to get the prefix, so implementing a hack here + macport_version=`port version 2>/dev/null` + if test "$?" -eq 0; then + macport_version="`echo "${macport_version}" } sed -ne 's/Version: \([0-9]\.[0-9]\.[0-9]\)/\1/gp'`" + echo_n "You seem to be running MacPorts version ${macport_version}..." + + $macport_prefix=`which port` + $macport_prefix=`dirname ${macport_prefix}` + + echo "adding ${macport_prefix} to paths" + + LDFLAGS="-L${macport_prefix}/lib $LDFLAGS" + CXXFLAGS="-I${macport_prefix}/lib $CXXFLAGS" + fi ;; dreamcast) DEFINES="$DEFINES -D__DC__" -- cgit v1.2.3 From 79632ea958537b23452c62dcc3ed809577d54495 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 26 Aug 2011 17:51:32 +0100 Subject: CONFIGURE: Fixes to MacPort detection --- configure | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index eca9005b8a..278b917ea1 100755 --- a/configure +++ b/configure @@ -1828,16 +1828,18 @@ case $_host_os in # There is no way to get the prefix, so implementing a hack here macport_version=`port version 2>/dev/null` if test "$?" -eq 0; then - macport_version="`echo "${macport_version}" } sed -ne 's/Version: \([0-9]\.[0-9]\.[0-9]\)/\1/gp'`" + macport_version="`echo "${macport_version}" | sed -ne 's/Version: \([0-9]\.[0-9]\.[0-9]\)/\1/gp'sed -ne 's/Version: \([0-9]\.[0-9]\.[0-9]\)/\1/gp'`" echo_n "You seem to be running MacPorts version ${macport_version}..." - $macport_prefix=`which port` - $macport_prefix=`dirname ${macport_prefix}` + macport_prefix=`which port` + # strip off /bin/port from /opt/local/bin/port + macport_prefix=`dirname ${macport_prefix}` + macport_prefix=`dirname ${macport_prefix}` echo "adding ${macport_prefix} to paths" LDFLAGS="-L${macport_prefix}/lib $LDFLAGS" - CXXFLAGS="-I${macport_prefix}/lib $CXXFLAGS" + CXXFLAGS="-I${macport_prefix}/include $CXXFLAGS" fi ;; dreamcast) -- cgit v1.2.3