Skip to content

Commit 9ce63b3

Browse files
Matthew BenedictMatthew Benedict
Matthew Benedict
authored and
Matthew Benedict
committed
Install name, etc.
1 parent 3a5239e commit 9ce63b3

19 files changed

Lines changed: 514 additions & 42 deletions

File tree

‎CyberKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@
66
<string>Original</string>
77
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
88
<false/>
9+
<key>PreviewsEnabled</key>
10+
<false/>
911
</dict>
1012
</plist>

‎Source/CyberCore/Configurations/CyberCore.xcconfig‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ INSTALL_PATH = $(INSTALL_PATH_$(WK_COCOA_TOUCH));
5757
INSTALL_PATH_cocoatouch = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
5858
INSTALL_PATH_ = $(WEBCORE_FRAMEWORKS_DIR);
5959

60-
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_PLATFORM);
61-
DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
62-
DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_PLATFORM_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
63-
DYLIB_INSTALL_NAME_BASE_PLATFORM_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
64-
DYLIB_INSTALL_NAME_BASE_PLATFORM_YES = $(DYLIB_INSTALL_NAME_BASE);
60+
DYLIB_INSTALL_NAME_BASE = @executable_path/Frameworks;
6561
INSTALLHDRS_COPY_PHASE = YES;
6662
INSTALLHDRS_SCRIPT_PHASE = YES;
6763
PRODUCT_NAME = CyberCore;
@@ -127,7 +123,7 @@ WK_URL_FORMATTING_LDFLAGS_YES = -framework URLFormatting;
127123
// FIXME: Reduce the number of allowable_clients <rdar://problem/31823969>
128124
OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client CyberCoreTestSupport -allowable_client CyberKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_SYSTEM_PREVIEW_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
129125

130-
OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client CyberKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client CyberKitTestRunner -allowable_client TestCyberKitAPI;
126+
OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client CyberKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client CyberKitTestRunner -allowable_client TestCyberKitAPI -allowable_client MobileMiniBrowser;
131127
OTHER_LDFLAGS_PLATFORM_macosx = -sub_library libobjc -umbrella CyberKit;
132128

133129
WK_UNDEFINED_SYMBOLS_LDFLAGS[sdk=macosx*] = $(WK_UNDEFINED_SYMBOLS_LDFLAGS$(WK_MACOS_1013));

‎Source/CyberCore/Configurations/CyberCoreTestShim.xcconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ SKIP_INSTALL_ = YES;
3333
SKIP_INSTALL_NO = YES;
3434
SKIP_INSTALL_YES = NO;
3535

36-
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(CONFIGURATION));
37-
DYLIB_INSTALL_NAME_BASE_Production = $(INSTALL_PATH);
38-
DYLIB_INSTALL_NAME_BASE_Debug = @rpath;
39-
DYLIB_INSTALL_NAME_BASE_Release = $(DYLIB_INSTALL_NAME_BASE_Debug);
36+
DYLIB_INSTALL_NAME_BASE = @executable_path/Frameworks;
4037

4138
PRODUCT_NAME = CyberCoreTestShim;
4239
EXECUTABLE_PREFIX = lib;

‎Source/CyberCore/Configurations/CyberCoreTestSupport.xcconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ SKIP_INSTALL_ = YES;
4343
SKIP_INSTALL_NO = YES;
4444
SKIP_INSTALL_YES = NO;
4545

46-
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(CONFIGURATION));
47-
DYLIB_INSTALL_NAME_BASE_Production = $(INSTALL_PATH);
48-
DYLIB_INSTALL_NAME_BASE_Debug = @rpath;
49-
DYLIB_INSTALL_NAME_BASE_Release = $(DYLIB_INSTALL_NAME_BASE_Debug);
46+
DYLIB_INSTALL_NAME_BASE = @executable_path/Frameworks;
5047

5148
LIBWEBRTC_LDFLAGS = $(LIBWEBRTC_LDFLAGS_$(ENABLE_WEB_RTC));
5249
LIBWEBRTC_LDFLAGS_ = ;

‎Source/CyberCore/CyberCore.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34448,6 +34448,7 @@
3444834448
buildSettings = {
3444934449
CODE_SIGN_IDENTITY = "Apple Development";
3445034450
CODE_SIGN_STYLE = Automatic;
34451+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
3445134452
DEVELOPMENT_TEAM = SJ87WGCZM7;
3445234453
ENABLE_BITCODE = NO;
3445334454
PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberCore;
@@ -34461,6 +34462,7 @@
3446134462
buildSettings = {
3446234463
CODE_SIGN_IDENTITY = "Apple Development";
3446334464
CODE_SIGN_STYLE = Automatic;
34465+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
3446434466
DEVELOPMENT_TEAM = SJ87WGCZM7;
3446534467
ENABLE_BITCODE = NO;
3446634468
PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberCore;
@@ -34475,6 +34477,7 @@
3447534477
BUILD_VARIANTS = normal;
3447634478
CODE_SIGN_IDENTITY = "Apple Development";
3447734479
CODE_SIGN_STYLE = Automatic;
34480+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
3447834481
DEVELOPMENT_TEAM = SJ87WGCZM7;
3447934482
ENABLE_BITCODE = NO;
3448034483
PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberCore;
@@ -34516,6 +34519,7 @@
3451634519
baseConfigurationReference = 4181707D1386EDF20057AAA4 /* CyberCoreTestSupport.xcconfig */;
3451734520
buildSettings = {
3451834521
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
34522+
ENABLE_BITCODE = NO;
3451934523
};
3452034524
name = Debug;
3452134525
};
@@ -34524,6 +34528,7 @@
3452434528
baseConfigurationReference = 4181707D1386EDF20057AAA4 /* CyberCoreTestSupport.xcconfig */;
3452534529
buildSettings = {
3452634530
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
34531+
ENABLE_BITCODE = NO;
3452734532
};
3452834533
name = Release;
3452934534
};
@@ -34532,6 +34537,7 @@
3453234537
baseConfigurationReference = 4181707D1386EDF20057AAA4 /* CyberCoreTestSupport.xcconfig */;
3453334538
buildSettings = {
3453434539
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
34540+
ENABLE_BITCODE = NO;
3453534541
};
3453634542
name = Production;
3453734543
};
@@ -34636,6 +34642,7 @@
3463634642
baseConfigurationReference = E1BA66F21742BDCC00C20251 /* CyberCoreTestShim.xcconfig */;
3463734643
buildSettings = {
3463834644
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
34645+
ENABLE_BITCODE = NO;
3463934646
};
3464034647
name = Debug;
3464134648
};
@@ -34644,6 +34651,7 @@
3464434651
baseConfigurationReference = E1BA66F21742BDCC00C20251 /* CyberCoreTestShim.xcconfig */;
3464534652
buildSettings = {
3464634653
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
34654+
ENABLE_BITCODE = NO;
3464734655
};
3464834656
name = Release;
3464934657
};
@@ -34652,6 +34660,7 @@
3465234660
baseConfigurationReference = E1BA66F21742BDCC00C20251 /* CyberCoreTestShim.xcconfig */;
3465334661
buildSettings = {
3465434662
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
34663+
ENABLE_BITCODE = NO;
3465534664
};
3465634665
name = Production;
3465734666
};

‎Source/CyberKit/Configurations/CyberKit.xcconfig‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ MODULEMAP_FILE_cocoatouch = Modules/iOS.modulemap;
3333
MODULEMAP_FILE_ = Modules/OSX.modulemap;
3434

3535
INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR);
36-
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
37-
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
38-
DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
36+
DYLIB_INSTALL_NAME_BASE = @executable_path/Frameworks;
3937

4038
LIBRARY_SEARCH_PATHS = $(inherited) "$(LIBWEBRTC_LIBRARY_DIR)";
4139

@@ -145,7 +143,7 @@ REEXPORTED_FRAMEWORK_NAMES[sdk=macosx*] = $(inherited) CyberCore;
145143

146144
// FIXME: Remove -reexport_install_name once rdar://problem/30820233 is fixed.
147145
OTHER_TAPI_FLAGS = $(OTHER_TAPI_FLAGS_$(WK_COCOA_TOUCH));
148-
OTHER_TAPI_FLAGS_cocoatouch = $(inherited) -reexport_install_name $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/CyberKitLegacy.framework/CyberKitLegacy -extra-private-header $(SRCROOT)/Platform/ExtraPrivateSymbolsForTAPI.h -extra-public-header $(SRCROOT)/Platform/ExtraPublicSymbolsForTAPI.h -exclude-private-header $(BUILT_PRODUCTS_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/NSURLDownloadSPI.h;
146+
OTHER_TAPI_FLAGS_cocoatouch = $(inherited) -reexport_install_name @executable_path/Frameworks/CyberKitLegacy.framework/CyberKitLegacy -extra-private-header $(SRCROOT)/Platform/ExtraPrivateSymbolsForTAPI.h -extra-public-header $(SRCROOT)/Platform/ExtraPublicSymbolsForTAPI.h -exclude-private-header $(BUILT_PRODUCTS_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/NSURLDownloadSPI.h;
149147

150148
SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
151149
SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/CyberKit.order;

‎Source/CyberKit/CyberKit.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12419,6 +12419,7 @@
1241912419
buildSettings = {
1242012420
CODE_SIGN_IDENTITY = "Apple Development";
1242112421
CODE_SIGN_STYLE = Automatic;
12422+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1242212423
DEVELOPMENT_TEAM = SJ87WGCZM7;
1242312424
ENABLE_BITCODE = NO;
1242412425
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
@@ -12433,6 +12434,7 @@
1243312434
buildSettings = {
1243412435
CODE_SIGN_IDENTITY = "Apple Development";
1243512436
CODE_SIGN_STYLE = Automatic;
12437+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1243612438
DEVELOPMENT_TEAM = SJ87WGCZM7;
1243712439
ENABLE_BITCODE = NO;
1243812440
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
@@ -12529,6 +12531,7 @@
1252912531
CODE_SIGN_ENTITLEMENTS = "";
1253012532
CODE_SIGN_IDENTITY = "Apple Development";
1253112533
CODE_SIGN_STYLE = Automatic;
12534+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1253212535
DEVELOPMENT_TEAM = SJ87WGCZM7;
1253312536
ENABLE_BITCODE = NO;
1253412537
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12543,6 +12546,7 @@
1254312546
CODE_SIGN_ENTITLEMENTS = "";
1254412547
CODE_SIGN_IDENTITY = "Apple Development";
1254512548
CODE_SIGN_STYLE = Automatic;
12549+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1254612550
DEVELOPMENT_TEAM = SJ87WGCZM7;
1254712551
ENABLE_BITCODE = NO;
1254812552
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12557,6 +12561,7 @@
1255712561
CODE_SIGN_ENTITLEMENTS = "";
1255812562
CODE_SIGN_IDENTITY = "Apple Development";
1255912563
CODE_SIGN_STYLE = Automatic;
12564+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1256012565
DEVELOPMENT_TEAM = SJ87WGCZM7;
1256112566
ENABLE_BITCODE = NO;
1256212567
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12640,6 +12645,7 @@
1264012645
buildSettings = {
1264112646
CODE_SIGN_IDENTITY = "Apple Development";
1264212647
CODE_SIGN_STYLE = Automatic;
12648+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1264312649
DEVELOPMENT_TEAM = SJ87WGCZM7;
1264412650
ENABLE_BITCODE = NO;
1264512651
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
@@ -12679,6 +12685,7 @@
1267912685
CODE_SIGN_ENTITLEMENTS = "";
1268012686
CODE_SIGN_IDENTITY = "Apple Development";
1268112687
CODE_SIGN_STYLE = Automatic;
12688+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1268212689
DEVELOPMENT_TEAM = SJ87WGCZM7;
1268312690
ENABLE_BITCODE = NO;
1268412691
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12693,6 +12700,7 @@
1269312700
CODE_SIGN_ENTITLEMENTS = "";
1269412701
CODE_SIGN_IDENTITY = "Apple Development";
1269512702
CODE_SIGN_STYLE = Automatic;
12703+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1269612704
DEVELOPMENT_TEAM = SJ87WGCZM7;
1269712705
ENABLE_BITCODE = NO;
1269812706
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12707,6 +12715,7 @@
1270712715
CODE_SIGN_ENTITLEMENTS = "";
1270812716
CODE_SIGN_IDENTITY = "Apple Development";
1270912717
CODE_SIGN_STYLE = Automatic;
12718+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1271012719
DEVELOPMENT_TEAM = SJ87WGCZM7;
1271112720
ENABLE_BITCODE = NO;
1271212721
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12721,6 +12730,7 @@
1272112730
CODE_SIGN_ENTITLEMENTS = "";
1272212731
CODE_SIGN_IDENTITY = "Apple Development";
1272312732
CODE_SIGN_STYLE = Automatic;
12733+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1272412734
DEVELOPMENT_TEAM = SJ87WGCZM7;
1272512735
ENABLE_BITCODE = NO;
1272612736
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12735,6 +12745,7 @@
1273512745
CODE_SIGN_ENTITLEMENTS = "";
1273612746
CODE_SIGN_IDENTITY = "Apple Development";
1273712747
CODE_SIGN_STYLE = Automatic;
12748+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1273812749
DEVELOPMENT_TEAM = SJ87WGCZM7;
1273912750
ENABLE_BITCODE = NO;
1274012751
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12749,6 +12760,7 @@
1274912760
CODE_SIGN_ENTITLEMENTS = "";
1275012761
CODE_SIGN_IDENTITY = "Apple Development";
1275112762
CODE_SIGN_STYLE = Automatic;
12763+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1275212764
DEVELOPMENT_TEAM = SJ87WGCZM7;
1275312765
ENABLE_BITCODE = NO;
1275412766
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12763,6 +12775,7 @@
1276312775
CODE_SIGN_ENTITLEMENTS = "";
1276412776
CODE_SIGN_IDENTITY = "Apple Development";
1276512777
CODE_SIGN_STYLE = Automatic;
12778+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1276612779
DEVELOPMENT_TEAM = SJ87WGCZM7;
1276712780
ENABLE_BITCODE = NO;
1276812781
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12777,6 +12790,7 @@
1277712790
CODE_SIGN_ENTITLEMENTS = "";
1277812791
CODE_SIGN_IDENTITY = "Apple Development";
1277912792
CODE_SIGN_STYLE = Automatic;
12793+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1278012794
DEVELOPMENT_TEAM = SJ87WGCZM7;
1278112795
ENABLE_BITCODE = NO;
1278212796
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12791,6 +12805,7 @@
1279112805
CODE_SIGN_ENTITLEMENTS = "";
1279212806
CODE_SIGN_IDENTITY = "Apple Development";
1279312807
CODE_SIGN_STYLE = Automatic;
12808+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1279412809
DEVELOPMENT_TEAM = SJ87WGCZM7;
1279512810
ENABLE_BITCODE = NO;
1279612811
PROVISIONING_PROFILE_SPECIFIER = "";

‎Source/CyberKitLegacy/CyberKitLegacy.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3622,7 +3622,9 @@
36223622
CODE_SIGN_IDENTITY = "Apple Development";
36233623
CODE_SIGN_STYLE = Automatic;
36243624
DEBUG_DEFINES = "$(DEBUG_DEFINES_debug) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
3625+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
36253626
DEVELOPMENT_TEAM = SJ87WGCZM7;
3627+
ENABLE_BITCODE = NO;
36263628
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
36273629
PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberKitLegacy;
36283630
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3636,7 +3638,9 @@
36363638
CODE_SIGN_IDENTITY = "Apple Development";
36373639
CODE_SIGN_STYLE = Automatic;
36383640
DEBUG_DEFINES = "$(DEBUG_DEFINES_$(CURRENT_VARIANT)) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
3641+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
36393642
DEVELOPMENT_TEAM = SJ87WGCZM7;
3643+
ENABLE_BITCODE = NO;
36403644
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
36413645
PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberKitLegacy;
36423646
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3650,7 +3654,9 @@
36503654
BUILD_VARIANTS = normal;
36513655
CODE_SIGN_IDENTITY = "Apple Development";
36523656
CODE_SIGN_STYLE = Automatic;
3657+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
36533658
DEVELOPMENT_TEAM = SJ87WGCZM7;
3659+
ENABLE_BITCODE = NO;
36543660
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
36553661
PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberKitLegacy;
36563662
PROVISIONING_PROFILE_SPECIFIER = "";

‎Source/CyberKitLegacy/mac/Configurations/CyberKitLegacy.xcconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@ INSTALL_PATH = $(INSTALL_PATH_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
6161
INSTALL_PATH_COCOA_TOUCH_YES = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
6262
INSTALL_PATH_COCOA_TOUCH_NO = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
6363

64-
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
65-
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
66-
DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
67-
DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
64+
DYLIB_INSTALL_NAME_BASE = @executable_path/Frameworks;
6865

6966
INSTALLHDRS_COPY_PHASE = YES;
7067
INSTALLHDRS_SCRIPT_PHASE = YES;

‎Source/CyberScriptCore/Configurations/CyberScriptCore.xcconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ OTHER_CPLUSPLUSFLAGS = $(inherited) --system-header-prefix=unicode/;
4848
HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/CyberScriptCore" $(HEADER_SEARCH_PATHS);
4949
INFOPLIST_FILE = Info.plist;
5050
INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR);
51-
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
52-
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR)
53-
DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
51+
DYLIB_INSTALL_NAME_BASE = @executable_path/Frameworks;
5452
PRODUCT_NAME = CyberScriptCore;
5553
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
5654

0 commit comments

Comments
 (0)