# HG changeset patch # User antonc27 # Date 1441487543 -7200 # Node ID 8c99fde7a594baf83c39e91e6c5a81af5aad8359 # Parent 737ba45f533a6ceb796a767fa7aebb3b0a7ce96d - arm64 added as valid arch - 'Skip Install' set to 'YES' for libraries - 'Build libfpc.a' modified - fpc compiling options cleared diff -r 737ba45f533a -r 8c99fde7a594 misc/liblua/Xcode/Lua.xcodeproj/project.pbxproj --- a/misc/liblua/Xcode/Lua.xcodeproj/project.pbxproj Thu Aug 27 23:52:38 2015 +0200 +++ b/misc/liblua/Xcode/Lua.xcodeproj/project.pbxproj Sat Sep 05 23:12:23 2015 +0200 @@ -367,7 +367,8 @@ GCC_PREFIX_HEADER = Lua_Prefix.pch; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = Lua; - VALID_ARCHS = "armv7 x86_64"; + SKIP_INSTALL = YES; + VALID_ARCHS = "armv7 x86_64 arm64"; }; name = Debug; }; @@ -381,7 +382,8 @@ GCC_PREFIX_HEADER = Lua_Prefix.pch; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = Lua; - VALID_ARCHS = "armv7 x86_64"; + SKIP_INSTALL = YES; + VALID_ARCHS = "armv7 x86_64 arm64"; }; name = Release; }; @@ -413,7 +415,7 @@ PREBINDING = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "armv7 armv7s"; + VALID_ARCHS = "armv7 armv7s arm64"; }; name = Debug; }; @@ -444,7 +446,7 @@ PREBINDING = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "armv7 armv7s"; + VALID_ARCHS = "armv7 armv7s arm64"; }; name = Release; }; diff -r 737ba45f533a -r 8c99fde7a594 misc/libphysfs/Xcode/Physfs.xcodeproj/project.pbxproj --- a/misc/libphysfs/Xcode/Physfs.xcodeproj/project.pbxproj Thu Aug 27 23:52:38 2015 +0200 +++ b/misc/libphysfs/Xcode/Physfs.xcodeproj/project.pbxproj Sat Sep 05 23:12:23 2015 +0200 @@ -243,6 +243,7 @@ GCC_PREFIX_HEADER = Physfs_Prefix.pch; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = Physfs; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -256,6 +257,7 @@ GCC_PREFIX_HEADER = Physfs_Prefix.pch; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = Physfs; + SKIP_INSTALL = YES; }; name = Release; }; @@ -291,7 +293,7 @@ OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; - VALID_ARCHS = "armv7 x86_64"; + VALID_ARCHS = "armv7 x86_64 arm64"; }; name = Debug; }; @@ -325,7 +327,7 @@ OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; - VALID_ARCHS = "armv7 x86_64"; + VALID_ARCHS = "armv7 x86_64 arm64"; }; name = Release; }; diff -r 737ba45f533a -r 8c99fde7a594 misc/libphyslayer/Xcode/Physlayer.xcodeproj/project.pbxproj --- a/misc/libphyslayer/Xcode/Physlayer.xcodeproj/project.pbxproj Thu Aug 27 23:52:38 2015 +0200 +++ b/misc/libphyslayer/Xcode/Physlayer.xcodeproj/project.pbxproj Sat Sep 05 23:12:23 2015 +0200 @@ -175,6 +175,7 @@ GCC_PREFIX_HEADER = Physlayer_Prefix.pch; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = Physlayer; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -188,6 +189,7 @@ GCC_PREFIX_HEADER = Physlayer_Prefix.pch; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = Physlayer; + SKIP_INSTALL = YES; }; name = Release; }; @@ -221,7 +223,7 @@ OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; - VALID_ARCHS = "armv7 x86_64"; + VALID_ARCHS = "armv7 x86_64 arm64"; }; name = Debug; }; @@ -253,7 +255,7 @@ OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; - VALID_ARCHS = "armv7 x86_64"; + VALID_ARCHS = "armv7 x86_64 arm64"; }; name = Release; }; diff -r 737ba45f533a -r 8c99fde7a594 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Thu Aug 27 23:52:38 2015 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sat Sep 05 23:12:23 2015 +0200 @@ -1649,7 +1649,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Build libfpc.a\n# 9 July 2006 (Jonas Maebe)\n# * original version\n# 15 September 2006 (Erling Johansen)\n# * simplified\n# 26 April 2007 (Jonas Maebe)\n# * added support for ppc64/x86_64 (future proofing)\n# 4 August 2007 (Jonas Maebe)\n# * call ranlib after ar so the toc of the library is up-to-date\n# 3 January 2009 (Jonas Maebe)\n# * support for ARM\n# 24 October 2009 (Jonas Maebe)\n# * don't hardcode version 2.3.1 anymore under certain circumstances\n# * use the FPC_RTL_UNITS_BASE setting\n# 13 December 2009 (Jonas Maebe)\n# * use new FPC_COMPILER_BINARY_DIR setting to make it easier to change the used FPC version\n\nrm -f \"$TARGET_TEMP_DIR\"/*.a\nnarch=\n\n#temparchs=`echo $ARCHS|sed -e 's/arm[^\\w]*/arm\\\n#/'|sort -u`\ntemparchs=($ARCHS)\necho $temparchs\nfor arch in $temparchs\ndo\n\ttargetos=darwin;\n\tcase $arch in\n arm64) fpc_arch=rossa64; fpc_rtl=aarch64 ;;\n armv7) fpc_arch=rossarm; fpc_rtl=arm ;;\n x86_64) fpc_arch=x64; fpc_rtl=x86_64; targetos=iphonesim ;;\n# ppc) fpc_arch=ppc; fpc_rtl=powerpc ;;\n#\t\ti386) fpc_arch=386; fpc_rtl=i386; targetos=iphonesim ;;\n#\t\tppc64) fpc_arch=ppc64; fpc_rtl=powerpc64 ;;\n#\t\tx86_64) fpc_arch=x64; fpc_rtl=x86_64 ;;\n#\t\tarm*) fpc_arch=arm; fpc_rtl=arm ;;\n\t\t*) continue\n\tesac\n\tif test -e \"${FPC_COMPILER_BINARY_DIR}\"/ppc${fpc_arch}\n\tthen\n\t\tupath=\"$FPC_RTL_UNITS_BASE\"/`\"${FPC_COMPILER_BINARY_DIR}\"/ppc${fpc_arch} -iV`/units/${fpc_rtl}-${targetos}\n\t\tar -q \"$TARGET_TEMP_DIR\"/libfpc${narch}.a `ls \"$upath\"/*/*.o | grep -v 'darwin/fv/'`\n\t\tranlib \"$TARGET_TEMP_DIR\"/libfpc${narch}.a\n\t\tnarch=${narch}x\n\telse\n\t\techo error: can\\'t build libfpc.a for $arch \\(${FPC_COMPILER_BINARY_DIR}/ppc${fpc_arch} not found, derived from FPC_COMPILER_BINARY_DIR project setting\\)\n\tfi\ndone\n\nif test ${#narch} -gt 1\nthen\n\tlipo -create \"$TARGET_TEMP_DIR\"/libfpc*.a -output \"$TARGET_BUILD_DIR\"/libfpc.a\n\trm -f \"$TARGET_TEMP_DIR\"/*.a\nelse\n\tmv \"$TARGET_TEMP_DIR\"/libfpc.a \"$TARGET_BUILD_DIR\"\nfi\n"; + shellScript = "# Build libfpc.a\n# 9 July 2006 (Jonas Maebe)\n# * original version\n# 15 September 2006 (Erling Johansen)\n# * simplified\n# 26 April 2007 (Jonas Maebe)\n# * added support for ppc64/x86_64 (future proofing)\n# 4 August 2007 (Jonas Maebe)\n# * call ranlib after ar so the toc of the library is up-to-date\n# 3 January 2009 (Jonas Maebe)\n# * support for ARM\n# 24 October 2009 (Jonas Maebe)\n# * don't hardcode version 2.3.1 anymore under certain circumstances\n# * use the FPC_RTL_UNITS_BASE setting\n# 13 December 2009 (Jonas Maebe)\n# * use new FPC_COMPILER_BINARY_DIR setting to make it easier to change the used FPC version\n\nrm -f \"$TARGET_TEMP_DIR\"/*.a\nnarch=\n\n#temparchs=`echo $ARCHS|sed -e 's/arm[^\\w]*/arm\\\n#/'|sort -u`\ntemparchs=`echo $ARCHS|sort -u`\necho $temparchs\nfor arch in $temparchs\ndo\n\ttargetos=darwin;\n\tcase $arch in\n arm64) fpc_arch=rossa64; fpc_rtl=aarch64 ;;\n armv7) fpc_arch=rossarm; fpc_rtl=arm ;;\n x86_64) fpc_arch=x64; fpc_rtl=x86_64; targetos=iphonesim ;;\n# ppc) fpc_arch=ppc; fpc_rtl=powerpc ;;\n#\t\ti386) fpc_arch=386; fpc_rtl=i386; targetos=iphonesim ;;\n#\t\tppc64) fpc_arch=ppc64; fpc_rtl=powerpc64 ;;\n#\t\tx86_64) fpc_arch=x64; fpc_rtl=x86_64 ;;\n#\t\tarm*) fpc_arch=arm; fpc_rtl=arm ;;\n\t\t*) continue\n\tesac\n\tif test -e \"${FPC_COMPILER_BINARY_DIR}\"/ppc${fpc_arch}\n\tthen\n\t\tupath=\"$FPC_RTL_UNITS_BASE\"/`\"${FPC_COMPILER_BINARY_DIR}\"/ppc${fpc_arch} -iV`/units/${fpc_rtl}-${targetos}\n\t\tar -q \"$TARGET_TEMP_DIR\"/libfpc${narch}.a `ls \"$upath\"/*/*.o | grep -v 'darwin/fv/'`\n\t\tranlib \"$TARGET_TEMP_DIR\"/libfpc${narch}.a\n\t\tnarch=${narch}x\n\telse\n\t\techo error: can\\'t build libfpc.a for $arch \\(${FPC_COMPILER_BINARY_DIR}/ppc${fpc_arch} not found, derived from FPC_COMPILER_BINARY_DIR project setting\\)\n\tfi\ndone\n \nif test ${#narch} -gt 1\nthen\n\tlipo -create \"$TARGET_TEMP_DIR\"/libfpc*.a -output \"$TARGET_BUILD_DIR\"/libfpc.a\n\trm -f \"$TARGET_TEMP_DIR\"/*.a\nelse\n\tmv \"$TARGET_TEMP_DIR\"/libfpc.a \"$TARGET_BUILD_DIR\"\nfi\n"; }; 928301560F10E04C00CC5A3C /* Compile Pascal Sources */ = { isa = PBXShellScriptBuildPhase; @@ -1945,7 +1945,7 @@ FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/3.1.1; FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas"; FPC_RTL_UNITS_BASE = /usr/local/lib/fpc; - FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -Os -Xs -Cfvfpv3 -dNOCONSOLE"; + FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -Os -Xs -dNOCONSOLE"; FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\""; GCC_C_LANGUAGE_STANDARD = c99; GCC_DEBUGGING_SYMBOLS = default; @@ -1995,7 +1995,7 @@ SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; - VALID_ARCHS = "armv7 x86_64"; + VALID_ARCHS = "armv7 x86_64 arm64"; WARNING_CFLAGS = ( "-Wall", "-Wbad-function-cast", @@ -2024,6 +2024,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; PREBINDING = NO; PRODUCT_NAME = fpc; + SKIP_INSTALL = YES; ZERO_LINK = NO; }; name = "Distro AppStore"; @@ -2060,7 +2061,7 @@ FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/3.1.1; FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas"; FPC_RTL_UNITS_BASE = /usr/local/lib/fpc; - FPC_SPECIFIC_OPTIONS = "-dDEBUGFILE -O- -g -gl -gw2 -gt -ghttt -Xs- -Cfvfpv3"; + FPC_SPECIFIC_OPTIONS = "-dDEBUGFILE -O- -g -gl -gw2 -gt -ghttt -Xs-"; FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\""; GCC_C_LANGUAGE_STANDARD = c99; GCC_DEBUGGING_SYMBOLS = full; @@ -2108,7 +2109,7 @@ SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; - VALID_ARCHS = "armv7 x86_64"; + VALID_ARCHS = "armv7 x86_64 arm64"; WARNING_CFLAGS = ( "-Wall", "-Wbad-function-cast", @@ -2137,6 +2138,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; PREBINDING = NO; PRODUCT_NAME = fpc; + SKIP_INSTALL = YES; ZERO_LINK = NO; }; name = "Distro Adhoc"; @@ -2181,6 +2183,7 @@ GCC_OPTIMIZATION_LEVEL = 0; PREBINDING = NO; PRODUCT_NAME = fpc; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -2192,6 +2195,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; PREBINDING = NO; PRODUCT_NAME = fpc; + SKIP_INSTALL = YES; ZERO_LINK = NO; }; name = Release; @@ -2264,7 +2268,7 @@ SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = NO; - VALID_ARCHS = "armv7 x86_64"; + VALID_ARCHS = "armv7 x86_64 arm64"; WARNING_CFLAGS = ( "-Wall", "-Wbad-function-cast", @@ -2295,7 +2299,7 @@ FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/3.1.1; FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas"; FPC_RTL_UNITS_BASE = /usr/local/lib/fpc; - FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -Os -Xs -Cparmv7 -Cfvfpv3 -dDEBUGFILE"; + FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -Os -Xs -dDEBUGFILE"; FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\""; GCC_C_LANGUAGE_STANDARD = c99; GCC_DEBUGGING_SYMBOLS = default; @@ -2333,7 +2337,7 @@ ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; LLVM_LTO = NO; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-lz", "-Wl,-no_order_inits", @@ -2344,7 +2348,7 @@ SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = NO; - VALID_ARCHS = "armv7 x86_64"; + VALID_ARCHS = "armv7 x86_64 arm64"; WARNING_CFLAGS = ( "-Wall", "-Wbad-function-cast", diff -r 737ba45f533a -r 8c99fde7a594 project_files/HedgewarsMobile/Info.plist --- a/project_files/HedgewarsMobile/Info.plist Thu Aug 27 23:52:38 2015 +0200 +++ b/project_files/HedgewarsMobile/Info.plist Sat Sep 05 23:12:23 2015 +0200 @@ -18,7 +18,7 @@ Icon-Small@2x.png CFBundleIdentifier - org.hedgewars.mobile + com.AC27.Hedgewars CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -33,17 +33,12 @@ ${HEDGEWARS_REVISION} LSRequiresIPhoneOS + UILaunchImageFile~ipad + Default-ipad UIPrerenderedIcon UIStatusBarHidden - UILaunchImageFile~ipad - Default-ipad - UISupportedInterfaceOrientations~iphone - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - UISupportedInterfaceOrientations~ipad UIInterfaceOrientationPortrait @@ -51,5 +46,10 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UISupportedInterfaceOrientations~iphone + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight +