From b9c48a2790c96925afa5a74fe0fe85c7a7e4409e Mon Sep 17 00:00:00 2001
From: Marcelo Junior <marcelo@liberton.com.br>
Date: Tue, 3 Feb 2015 00:14:35 -0200
Subject: [PATCH] Xcode modifications to pull request to gideros/master

This is the modifications from 64 bits libraries.

Changed 2 flags:
1) To build from 32 and 64 binaries at same lib:
From ARCHS = "$(ARCHS_STANDARD_32_BIT)";
To ARCHS = "$(ARCHS_STANDARD)";

2) To build from two selected archs:
From ONLY_ACTIVE_ARCH = YES;
To ONLY_ACTIVE_ARCH = NO;
---
 ios/iosplayer/iosplayer.xcodeproj/project.pbxproj          | 7 ++++---
 libgvfs/gvfs.xcodeproj/project.pbxproj                     | 5 ++++-
 lua/lua.xcodeproj/project.pbxproj                          | 5 ++++-
 .../LuaSocket/source/luasocket.xcodeproj/project.pbxproj   | 5 ++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ios/iosplayer/iosplayer.xcodeproj/project.pbxproj b/ios/iosplayer/iosplayer.xcodeproj/project.pbxproj
index 980b3eb2b..c5ad17a42 100644
--- a/ios/iosplayer/iosplayer.xcodeproj/project.pbxproj
+++ b/ios/iosplayer/iosplayer.xcodeproj/project.pbxproj
@@ -1731,7 +1731,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -1777,7 +1777,7 @@
 					"../../libgid/external/zlib-1.2.8",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -1786,7 +1786,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -1827,6 +1827,7 @@
 					"../../libgid/external/zlib-1.2.8",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
diff --git a/libgvfs/gvfs.xcodeproj/project.pbxproj b/libgvfs/gvfs.xcodeproj/project.pbxproj
index 76061c082..6657b6722 100644
--- a/libgvfs/gvfs.xcodeproj/project.pbxproj
+++ b/libgvfs/gvfs.xcodeproj/project.pbxproj
@@ -276,6 +276,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -300,7 +301,7 @@
 					.,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -309,6 +310,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -326,6 +328,7 @@
 					.,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
diff --git a/lua/lua.xcodeproj/project.pbxproj b/lua/lua.xcodeproj/project.pbxproj
index ffb15e026..e28864a5c 100644
--- a/lua/lua.xcodeproj/project.pbxproj
+++ b/lua/lua.xcodeproj/project.pbxproj
@@ -124,6 +124,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -148,7 +149,7 @@
 					./src,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -157,6 +158,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -174,6 +176,7 @@
 					./src,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
diff --git a/plugins/LuaSocket/source/luasocket.xcodeproj/project.pbxproj b/plugins/LuaSocket/source/luasocket.xcodeproj/project.pbxproj
index 2e8168d7f..8fd3289f7 100644
--- a/plugins/LuaSocket/source/luasocket.xcodeproj/project.pbxproj
+++ b/plugins/LuaSocket/source/luasocket.xcodeproj/project.pbxproj
@@ -192,6 +192,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -213,7 +214,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../../Sdk/include;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -222,6 +223,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -236,6 +238,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../../Sdk/include;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};