Merge pull request #5 from flovilmart/master

Fix mac targets
mrackwitz · Oct 28, 2015 · 6b2682f · 6b2682f
2 parents 380fde0 + a6b41fb
commit 6b2682f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/UniversalFramework_Base.xcconfig b/UniversalFramework_Base.xcconfig
@@ -9,11 +9,11 @@
 SUPPORTED_PLATFORMS                    = macosx iphonesimulator iphoneos watchos watchsimulator appletvos appletvsimulator
 VALID_ARCHS[sdk=macosx*]               = i386 x86_64
 VALID_ARCHS[sdk=iphoneos*]             = arm64 armv7 armv7s
-VALID_ARCHS[sdk=iphonesimulator*]      = arm64 armv7 armv7s
+VALID_ARCHS[sdk=iphonesimulator*]      = i386 x86_64
 VALID_ARCHS[sdk=watchos*]              = armv7k
-VALID_ARCHS[sdk=watchsimulator*]       = armv7k
+VALID_ARCHS[sdk=watchsimulator*]       = i386
 VALID_ARCHS[sdk=appletv*]              = arm64
-VALID_ARCHS[sdk=appletvsimulator*]     = arm64
+VALID_ARCHS[sdk=appletvsimulator*]     = x86_64
 
 // Dynamic linking uses different default copy paths
 LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]           = $(inherited) '@executable_path/../Frameworks' '@loader_path/Frameworks'

diff --git a/UniversalFramework_Framework.xcconfig b/UniversalFramework_Framework.xcconfig
@@ -22,3 +22,11 @@ TARGETED_DEVICE_FAMILY[sdk=appletv*]          = 3
 // Watch-specific default settings
 TARGETED_DEVICE_FAMILY[sdk=watchsimulator*]   = 4
 TARGETED_DEVICE_FAMILY[sdk=watch*]            = 4
+
+ENABLE_BITCODE[sdk=macosx*]                   = NO
+ENABLE_BITCODE[sdk=watchsimulator*]           = YES
+ENABLE_BITCODE[sdk=watch*]                    = YES
+ENABLE_BITCODE[sdk=iphonesimulator*]          = YES
+ENABLE_BITCODE[sdk=iphone*]                   = YES
+ENABLE_BITCODE[sdk=appletvsimulator*]         = YES
+ENABLE_BITCODE[sdk=appletv*]                  = YES