libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 14:51:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

IOS: Fixes compilation under Linux

Browse Source
This commit is contained in:
Vincent Bénony 2015-12-06 12:29:06 +01:00
parent 873e38372b
commit dcad83e05b
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -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)

2
ports.mk
View File

@ -167,7 +167,7 @@ ios7bundle: ios7
s=2}\
s==0 {print $$0}\
s > 0 { s-- }' $(srcdir)/dists/ios7/Info.plist >$(bundle_name)/Info.plist
sed -i '' -e 's/$$(PRODUCT_BUNDLE_IDENTIFIER)/org.scummvm.scummvm/' $(bundle_name)/Info.plist
sed -i'' -e 's/$$(PRODUCT_BUNDLE_IDENTIFIER)/org.scummvm.scummvm/' $(bundle_name)/Info.plist
cp $(DIST_FILES_DOCS) $(bundle_name)/
cp $(DIST_FILES_THEMES) $(bundle_name)/
ifdef DIST_FILES_ENGINEDATA