From 41e3929663784d17b351553731b3f8f78c409912 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Wed, 21 Jan 2015 13:32:22 -0200 Subject: [PATCH] Adding 64bit support --- ios/draggable.xcodeproj/project.pbxproj | 50 +++++++------------------ ios/manifest | 2 +- ios/titanium.xcconfig | 3 +- 3 files changed, 17 insertions(+), 38 deletions(-) diff --git a/ios/draggable.xcodeproj/project.pbxproj b/ios/draggable.xcodeproj/project.pbxproj index 9e8c90c..817b831 100644 --- a/ios/draggable.xcodeproj/project.pbxproj +++ b/ios/draggable.xcodeproj/project.pbxproj @@ -263,15 +263,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator8.1]" = "$(ARCHS_STANDARD)"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DSTROOT = /tmp/TiDraggable.dst; @@ -302,6 +295,7 @@ RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "armv7 arm64 i386 x86_64"; }; name = Debug; }; @@ -310,15 +304,8 @@ baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator8.1]" = "$(ARCHS_STANDARD)"; DSTROOT = /tmp/TiDraggable.dst; GCC_C_LANGUAGE_STANDARD = c99; GCC_MODEL_TUNING = G5; @@ -343,6 +330,7 @@ RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "armv7 arm64 i386 x86_64"; }; name = Release; }; @@ -350,15 +338,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator8.1]" = "$(ARCHS_STANDARD)"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DSTROOT = /tmp/TiDraggable.dst; @@ -389,6 +370,7 @@ RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "armv7 arm64 i386 x86_64"; }; name = Debug; }; @@ -397,15 +379,8 @@ baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator8.1]" = "$(ARCHS_STANDARD)"; DSTROOT = /tmp/TiDraggable.dst; GCC_C_LANGUAGE_STANDARD = c99; GCC_MODEL_TUNING = G5; @@ -430,6 +405,7 @@ RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "armv7 arm64 i386 x86_64"; }; name = Release; }; @@ -441,6 +417,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; PRODUCT_NAME = "Build & test"; + VALID_ARCHS = "armv7 arm64 i386 x86_64"; }; name = Debug; }; @@ -452,6 +429,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; PRODUCT_NAME = "Build & test"; ZERO_LINK = NO; + VALID_ARCHS = "armv7 arm64 i386 x86_64"; }; name = Release; }; diff --git a/ios/manifest b/ios/manifest index ecb83b4..9dabc15 100644 --- a/ios/manifest +++ b/ios/manifest @@ -2,7 +2,7 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 1.3.1 +version: 1.3.2 apiversion: 2 description: Ti.Draggable author: Pedro Enrique diff --git a/ios/titanium.xcconfig b/ios/titanium.xcconfig index 37f19ca..7e83e14 100644 --- a/ios/titanium.xcconfig +++ b/ios/titanium.xcconfig @@ -4,7 +4,7 @@ // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR // // -TITANIUM_SDK_VERSION = 2.1.3.GA +TITANIUM_SDK_VERSION = 3.5.0.GA // @@ -13,6 +13,7 @@ TITANIUM_SDK_VERSION = 2.1.3.GA TITANIUM_SDK = ~/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION) TITANIUM_BASE_SDK = "$(TITANIUM_SDK)/iphone/include" TITANIUM_BASE_SDK2 = "$(TITANIUM_SDK)/iphone/include/TiCore" +TITANIUM_BASE_SDK3 = "$(TITANIUM_SDK)/iphone/include/JavaScriptCore" HEADER_SEARCH_PATHS= $(TITANIUM_BASE_SDK) $(TITANIUM_BASE_SDK2)