From 6ed6f6e7ea0410a999790c4f5150e3c23a26bd1e Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Tue, 1 Dec 2015 20:55:09 +0100 Subject: IOS: Fixes configure script --- configure | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) (limited to 'configure') diff --git a/configure b/configure index ad513e0079..6cca146322 100755 --- a/configure +++ b/configure @@ -2049,16 +2049,23 @@ define_in_config_h_if_yes $_need_memalign 'SCUMM_NEED_ALIGNMENT' echo_n "Checking host CPU architecture... " case $_host_cpu in 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' - # FIXME: The following feature exhibits a bug during the intro scene of Indy 4 - # (on Pandora and iPhone at least) - #define_in_config_if_yes yes 'USE_ARM_COSTUME_ASM' - - append_var DEFINES "-DARM_TARGET" + case $_host_alias in + arm-apple*) + echo "Apple iPhone - ARM assembly disabled" + ;; + *) + 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' + # FIXME: The following feature exhibits a bug during the intro scene of Indy 4 + # (on Pandora and iPhone at least) + #define_in_config_if_yes yes 'USE_ARM_COSTUME_ASM' + + append_var DEFINES "-DARM_TARGET" + ;; + esac ;; i[3-6]86) echo "x86" @@ -2691,12 +2698,16 @@ if test -n "$_host"; then ;; iphone) append_var DEFINES "-DIPHONE" - append_var ASFLAGS "-arch armv6" + append_var CFLAGS "-Wno-shift-count-overflow" + append_var CXXFLAGS "-Wno-shift-count-overflow" _backend="iphone" _build_scalers=no _mt32emu=no _seq_midi=no _timidity=no + _ar="ar cru" + _ranlib=ranlib + _strip=strip ;; m68k-atari-mint) append_var DEFINES "-DSYSTEM_NOT_SUPPORTING_D_TYPE" @@ -2990,6 +3001,9 @@ case $_backend in append_var LIBS "-lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES" append_var LIBS "-framework QuartzCore -framework CoreFoundation -framework Foundation" append_var LIBS "-framework AudioToolbox -framework CoreAudio" + append_var LDFLAGS "-isysroot $SDKROOT -miphoneos-version-min=9.0 -arch armv7" + append_var CFLAGS "-isysroot $SDKROOT -miphoneos-version-min=9.0 -arch armv7" + append_var CXXFLAGS "-isysroot $SDKROOT -miphoneos-version-min=9.0 -arch armv7" ;; linuxmoto) append_var DEFINES "-DLINUXMOTO" -- cgit v1.2.3 From 62e281df263b3f88360d2fb514eb6590eee39c11 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Wed, 2 Dec 2015 15:20:33 +0100 Subject: IOS: Changes the deployment target to iOS 7.0 --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 6cca146322..1f4e8e3318 100755 --- a/configure +++ b/configure @@ -3001,9 +3001,9 @@ case $_backend in append_var LIBS "-lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES" append_var LIBS "-framework QuartzCore -framework CoreFoundation -framework Foundation" append_var LIBS "-framework AudioToolbox -framework CoreAudio" - append_var LDFLAGS "-isysroot $SDKROOT -miphoneos-version-min=9.0 -arch armv7" - append_var CFLAGS "-isysroot $SDKROOT -miphoneos-version-min=9.0 -arch armv7" - append_var CXXFLAGS "-isysroot $SDKROOT -miphoneos-version-min=9.0 -arch armv7" + append_var LDFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.0 -arch armv7" + append_var CFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.0 -arch armv7" + append_var CXXFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.0 -arch armv7" ;; linuxmoto) append_var DEFINES "-DLINUXMOTO" -- cgit v1.2.3 From 304bffa90e6d32963d50a7cae64d1a7f186a5a81 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Wed, 2 Dec 2015 17:15:31 +0100 Subject: IOS: Once again, changes the iOS deployment target --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 1f4e8e3318..dc2994d33b 100755 --- a/configure +++ b/configure @@ -3001,9 +3001,9 @@ case $_backend in append_var LIBS "-lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES" append_var LIBS "-framework QuartzCore -framework CoreFoundation -framework Foundation" append_var LIBS "-framework AudioToolbox -framework CoreAudio" - append_var LDFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.0 -arch armv7" - append_var CFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.0 -arch armv7" - append_var CXXFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.0 -arch armv7" + append_var LDFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.1 -arch armv7" + append_var CFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.1 -arch armv7" + append_var CXXFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.1 -arch armv7" ;; linuxmoto) append_var DEFINES "-DLINUXMOTO" -- cgit v1.2.3 From 3831caaac5440132844c3ee038f01a511a7dc59a Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Wed, 2 Dec 2015 17:19:45 +0100 Subject: IOS: Uses the SDKROOT variable only if provided --- configure | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index dc2994d33b..cf70f8cb5f 100755 --- a/configure +++ b/configure @@ -3001,9 +3001,14 @@ case $_backend in append_var LIBS "-lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES" append_var LIBS "-framework QuartzCore -framework CoreFoundation -framework Foundation" append_var LIBS "-framework AudioToolbox -framework CoreAudio" - append_var LDFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.1 -arch armv7" - append_var CFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.1 -arch armv7" - append_var CXXFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.1 -arch armv7" + append_var LDFLAGS "-miphoneos-version-min=7.1 -arch armv7" + append_var CFLAGS "-miphoneos-version-min=7.1 -arch armv7" + append_var CXXFLAGS "-miphoneos-version-min=7.1 -arch armv7" + if test -n "$SDKROOT"; then + append_var LDFLAGS "-isysroot $SDKROOT" + append_var CFLAGS "-isysroot $SDKROOT" + append_var CXXFLAGS "-isysroot $SDKROOT" + fi ;; linuxmoto) append_var DEFINES "-DLINUXMOTO" -- cgit v1.2.3 From 638dc113f8c05f121d50e68f68c4e86c130756a4 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Fri, 4 Dec 2015 18:20:09 +0100 Subject: IOS: Create two targets for old iPhone (iOS <= 6) and new one (iOS >= 7) The "iphone" backend is the support for the old iPhones. The "ios7" backend is for the new iPhones. --- configure | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'configure') diff --git a/configure b/configure index cf70f8cb5f..b3008a13d6 100755 --- a/configure +++ b/configure @@ -835,7 +835,7 @@ Usage: $0 [OPTIONS]... Configuration: -h, --help display this help and exit --backend=BACKEND backend to build (android, tizen, dc, dingux, ds, gcw0, - gph, iphone, linuxmoto, maemo, n64, null, openpandora, + gph, iphone, ios7, linuxmoto, maemo, n64, null, openpandora, ps2, psp, samsungtv, sdl, webos, wii, wince) [sdl] Installation directories: @@ -875,7 +875,8 @@ Special configuration feature: gcw0 for GCW Zero gp2x for GP2X gp2xwiz for GP2X Wiz - iphone for Apple iPhone + iphone for Apple iPhone (iOS <= 6) + ios7 for Apple iPhone / iPad (iOS >= 7) linupy for Yopy PDA maemo for Nokia Maemo motoezx for MotoEZX @@ -1362,6 +1363,11 @@ iphone) _host_cpu=arm _host_alias=arm-apple-darwin9 ;; +ios7) + _host_os=iphone + _host_cpu=arm + _host_alias=arm-apple-darwin11 + ;; linupy) _host_os=linux _host_cpu=arm @@ -2697,10 +2703,19 @@ if test -n "$_host"; then _port_mk="backends/platform/gph/gp2xwiz-bundle.mk" ;; iphone) + append_var DEFINES "-DIPHONE" + append_var ASFLAGS "-arch armv6" + _backend="iphone" + _build_scalers=no + _mt32emu=no + _seq_midi=no + _timidity=no + ;; + ios7) append_var DEFINES "-DIPHONE" append_var CFLAGS "-Wno-shift-count-overflow" append_var CXXFLAGS "-Wno-shift-count-overflow" - _backend="iphone" + _backend="ios7" _build_scalers=no _mt32emu=no _seq_midi=no @@ -2998,6 +3013,11 @@ case $_backend in fi ;; iphone) + append_var LIBS "-lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES" + append_var LIBS "-framework QuartzCore -framework CoreFoundation -framework Foundation" + append_var LIBS "-framework AudioToolbox -framework CoreAudio" + ;; + ios7) append_var LIBS "-lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES" append_var LIBS "-framework QuartzCore -framework CoreFoundation -framework Foundation" append_var LIBS "-framework AudioToolbox -framework CoreAudio" @@ -3005,9 +3025,9 @@ case $_backend in append_var CFLAGS "-miphoneos-version-min=7.1 -arch armv7" append_var CXXFLAGS "-miphoneos-version-min=7.1 -arch armv7" if test -n "$SDKROOT"; then - append_var LDFLAGS "-isysroot $SDKROOT" - append_var CFLAGS "-isysroot $SDKROOT" - append_var CXXFLAGS "-isysroot $SDKROOT" + append_var LDFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include" + append_var CFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include" + append_var CXXFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include" fi ;; linuxmoto) @@ -3144,7 +3164,7 @@ esac # Enable 16bit support only for backends which support it # case $_backend in - android | dingux | dc | gph | iphone | maemo | openpandora | psp | samsungtv | sdl | tizen | webos | wii) + android | dingux | dc | gph | iphone | ios7 | maemo | openpandora | psp | samsungtv | sdl | tizen | webos | wii) if test "$_16bit" = auto ; then _16bit=yes else @@ -3203,7 +3223,7 @@ case $_host_os in amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp | wii | wince) _posix=no ;; - android | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos) + android | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos) _posix=yes ;; os2-emx*) -- cgit v1.2.3 From dcad83e05b51a268d805163d1b83feb90198b7f3 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Sun, 6 Dec 2015 12:29:06 +0100 Subject: IOS: Fixes compilation under Linux --- configure | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'configure') diff --git a/configure b/configure index b3008a13d6..025e577be9 100755 --- a/configure +++ b/configure @@ -2056,8 +2056,8 @@ echo_n "Checking host CPU architecture... " case $_host_cpu in arm*) case $_host_alias in - arm-apple*) - echo "Apple iPhone - ARM assembly disabled" + arm-apple-darwin11) + echo "Apple iOS 7+ - ARM assembly disabled" ;; *) echo "ARM" @@ -2720,9 +2720,6 @@ if test -n "$_host"; then _mt32emu=no _seq_midi=no _timidity=no - _ar="ar cru" - _ranlib=ranlib - _strip=strip ;; m68k-atari-mint) append_var DEFINES "-DSYSTEM_NOT_SUPPORTING_D_TYPE" @@ -3025,9 +3022,9 @@ case $_backend in append_var CFLAGS "-miphoneos-version-min=7.1 -arch armv7" append_var CXXFLAGS "-miphoneos-version-min=7.1 -arch armv7" if test -n "$SDKROOT"; then - append_var LDFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include" - append_var CFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include" - append_var CXXFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include" + append_var LDFLAGS "-mlinker-version=134.9 -B/usr/local/bin/arm-apple-darwin11-" + append_var CFLAGS "-isysroot $SDKROOT -F$SDKROOT/System/Library/Frameworks" + append_var CXXFLAGS "-isysroot $SDKROOT -I$SDKROOT/usr/include/c++/4.2.1 -F$SDKROOT/System/Library/Frameworks" fi ;; linuxmoto) -- cgit v1.2.3