Skip to content

Commit a7a51da

Browse files
committed
Better integration of build settings
1 parent 7ec0011 commit a7a51da

File tree

4 files changed

+39
-32
lines changed

4 files changed

+39
-32
lines changed

Configurations/Bolts-iOS-Dynamic.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
// of patent rights can be found in the PATENTS file in the same directory.
88
//
99

10+
#include "Configurations/Framework-iOS-Dynamic.xcconfig"
11+
1012
SUPPORTED_PLATFORMS = iphonesimulator iphoneos
1113
VALID_ARCHS[sdk=iphoneos*] = arm64 armv7 armv7s
1214
VALID_ARCHS[sdk=iphonesimulator*] = i386 x86_64
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
//
2+
// Copyright (c) 2015-present, Parse, LLC.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
// Common configuration for iOS-Dynamic frameworks
11+
12+
13+
SUPPORTED_PLATFORMS = iphonesimulator iphoneos
14+
VALID_ARCHS[sdk=iphoneos*] = arm64 armv7 armv7s
15+
VALID_ARCHS[sdk=iphonesimulator*] = i386 x86_64
16+
17+
ENABLE_BITCODE = NO
18+
ENABLE_BITCODE[sdk=iphoneos*] = YES
19+
ENABLE_BITCODE[sdk=iphonesimulator*] = YES
20+
21+
// Dynamic linking uses different default copy paths
22+
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
23+
24+
DYLIB_INSTALL_NAME_BASE = @rpath
25+
26+
MACH_O_TYPE = mh_dylib
27+
CLANG_MODULES_AUTOLINK = YES
28+
IPHONEOS_DEPLOYMENT_TARGET = 8.0
29+
ONLY_ACTIVE_ARCH = NO

Configurations/Parse-iOS-Dynamic.xcconfig

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,44 +6,18 @@
66
// LICENSE file in the root directory of this source tree. An additional grant
77
// of patent rights can be found in the PATENTS file in the same directory.
88
//
9-
9+
#include "Shared/Platform/iOS.xcconfig"
1010
#include "Shared/Product/Framework.xcconfig"
11+
#include "Configurations/Parse-iOS.xcconfig"
12+
#include "Configurations/Framework-iOS-Dynamic.xcconfig"
1113

12-
PRODUCT_NAME = Parse
13-
IPHONEOS_DEPLOYMENT_TARGET = 8.0
14-
// This silence a warning
1514

15+
// Force SDKROOT to the passed var
16+
SDKROOT = $(SDKROOT)
17+
// This silence a warning
1618
SDKROOT[sdk=macos*] = iphoneos
17-
SDKROOT[sdk=iphoneos*] = iphoneos
18-
SDKROOT[sdk=iphonesimulator*] = iphonesimulator
19-
20-
MACH_O_TYPE = mh_dylib
21-
22-
ENABLE_BITCODE = NO
23-
ENABLE_BITCODE[sdk=iphoneos*] = YES
24-
ENABLE_BITCODE[sdk=iphonesimulator*] = YES
25-
DEFINES_MODULE = YES
26-
27-
SUPPORTED_PLATFORMS = iphonesimulator iphoneos
28-
29-
VALID_ARCHS[sdk=iphoneos*] = arm64 armv7 armv7s
30-
VALID_ARCHS[sdk=iphonesimulator*] = i386 x86_64
31-
32-
ARCHS[sdk=iphoneos*] = arm64 armv7 armv7s
33-
ARCHS[sdk=iphonesimulator*] = i386 x86_64
3419

3520
// Breaks the build if intherited $(BUILD_PRODUCTS_DIR)
3621
FRAMEWORK_SEARCH_PATHS = $PARSE_DIR/build
3722

38-
// Dynamic linking uses different default copy paths
39-
LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
40-
LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
41-
42-
DYLIB_INSTALL_NAME_BASE = @rpath
43-
4423
OTHER_LDFLAGS = $(inherited) '-dynamiclib' '-lsqlite3'
45-
CLANG_MODULES_AUTOLINK = YES
46-
47-
ONLY_ACTIVE_ARCH = NO
48-
49-
INFOPLIST_FILE = $(PROJECT_DIR)/$(PRODUCT_NAME)/Resources/Parse-iOS.Info.plist

Parse.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,6 +1728,7 @@
17281728
49FDE2ED158C138F00126F64 /* PFPurchase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPurchase.m; sourceTree = "<group>"; };
17291729
4A26C3B61C053AEE00E5F505 /* Parse-iOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Parse-iOS-Dynamic.xcconfig"; sourceTree = "<group>"; };
17301730
4A8E7F291C06458F00E8AF28 /* Bolts-iOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Bolts-iOS-Dynamic.xcconfig"; sourceTree = "<group>"; };
1731+
4A9C0E851C0B7DDE009DC60E /* Framewok-iOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Framewok-iOS-Dynamic.xcconfig"; sourceTree = "<group>"; };
17311732
63723F6D1565A085007A1A73 /* PFRole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFRole.h; sourceTree = "<group>"; };
17321733
63723F6E1565A085007A1A73 /* PFRole.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFRole.m; sourceTree = "<group>"; };
17331734
638CBBB415191435004F54E4 /* PFAnonymousUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFAnonymousUtils.h; sourceTree = "<group>"; };
@@ -3732,6 +3733,7 @@
37323733
F55ABB501B4F39DA00A0ECD5 /* Configurations */ = {
37333734
isa = PBXGroup;
37343735
children = (
3736+
4A9C0E851C0B7DDE009DC60E /* Framewok-iOS-Dynamic.xcconfig */,
37353737
F55ABB531B4F39DA00A0ECD5 /* Parse-iOS.xcconfig */,
37363738
4A26C3B61C053AEE00E5F505 /* Parse-iOS-Dynamic.xcconfig */,
37373739
F55ABB541B4F39DA00A0ECD5 /* Parse-OSX.xcconfig */,

0 commit comments

Comments
 (0)