Skip to content

Commit e71c476

Browse files
committed
Remove UNORDERED=1, it's no longer needed and breaks Catalyst builds.
Let Xcode update framework name
1 parent f167870 commit e71c476

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

WhirlyGlobe.podspec

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ Pod::Spec.new do |s|
3535
__IPHONEOS__
3636
SQLITE_OPEN_READONLY
3737
HAVE_PTHREAD=1
38-
UNORDERED=1
3938
).join(" "),
4039
"HEADER_SEARCH_PATHS" => %w(
4140
"$(SDKROOT)/usr/include/libxml2"

ios/apps/AutoTester/AutoTester.xcodeproj/project.pbxproj

+7-9
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107
2BF29B8C24D2268200553963 /* LegendViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2BF29B8B24D2268200553963 /* LegendViewController.storyboard */; };
108108
2BF29B8F24D226B000553963 /* LegendViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BF29B8E24D226B000553963 /* LegendViewController.swift */; };
109109
2BFC7E511D132DCB0040E2A3 /* ScreenMarkersTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BFC7E501D132DCB0040E2A3 /* ScreenMarkersTestCase.m */; };
110+
31041A2227A36D53004B25E1 /* WhirlyGlobe.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8F858AFC1E7FE60C00037D4E /* WhirlyGlobe.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
110111
31041A3E27A4AE76004B25E1 /* ActiveObjectTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31041A3D27A4AE76004B25E1 /* ActiveObjectTestCase.swift */; };
111-
31041A2227A36D53004B25E1 /* WhirlyGlobeMaplyComponent.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8F858AFC1E7FE60C00037D4E /* WhirlyGlobeMaplyComponent.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
112112
311E0A9C2680F597007BE16F /* ATS_Route.shp in Resources */ = {isa = PBXBuildFile; fileRef = 311E0A902680F597007BE16F /* ATS_Route.shp */; };
113113
311E0A9D2680F597007BE16F /* Airspace_Boundary.dbf in Resources */ = {isa = PBXBuildFile; fileRef = 311E0A912680F597007BE16F /* Airspace_Boundary.dbf */; };
114114
311E0A9E2680F597007BE16F /* Airspace_Boundary.shx in Resources */ = {isa = PBXBuildFile; fileRef = 311E0A922680F597007BE16F /* Airspace_Boundary.shx */; };
@@ -526,7 +526,7 @@
526526
88FF5EF31BC31D95002F15CE /* tl_2013_06075_roads.sqlite in Resources */ = {isa = PBXBuildFile; fileRef = 88FF5DF41BC31D95002F15CE /* tl_2013_06075_roads.sqlite */; };
527527
8F4D91DC1CDFA7DE00F68045 /* globe.png in Resources */ = {isa = PBXBuildFile; fileRef = 8F4D91DA1CDFA7DE00F68045 /* globe.png */; };
528528
8F4D91DD1CDFA7DE00F68045 /* map.png in Resources */ = {isa = PBXBuildFile; fileRef = 8F4D91DB1CDFA7DE00F68045 /* map.png */; };
529-
8F858B011E7FE7EB00037D4E /* WhirlyGlobeMaplyComponent.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F858AFC1E7FE60C00037D4E /* WhirlyGlobeMaplyComponent.framework */; };
529+
8F858B011E7FE7EB00037D4E /* WhirlyGlobe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F858AFC1E7FE60C00037D4E /* WhirlyGlobe.framework */; };
530530
8F981DB81DE3577C00717DF1 /* ne_10m_roads.dbf in Resources */ = {isa = PBXBuildFile; fileRef = 8F981DB21DE3577C00717DF1 /* ne_10m_roads.dbf */; };
531531
8F981DB91DE3577C00717DF1 /* ne_10m_roads.prj in Resources */ = {isa = PBXBuildFile; fileRef = 8F981DB31DE3577C00717DF1 /* ne_10m_roads.prj */; };
532532
8F981DBB1DE3577C00717DF1 /* ne_10m_roads.shp in Resources */ = {isa = PBXBuildFile; fileRef = 8F981DB51DE3577C00717DF1 /* ne_10m_roads.shp */; };
@@ -608,7 +608,7 @@
608608
dstPath = "";
609609
dstSubfolderSpec = 10;
610610
files = (
611-
31041A2227A36D53004B25E1 /* WhirlyGlobeMaplyComponent.framework in Embed Frameworks */,
611+
31041A2227A36D53004B25E1 /* WhirlyGlobe.framework in Embed Frameworks */,
612612
);
613613
name = "Embed Frameworks";
614614
runOnlyForDeploymentPostprocessing = 0;
@@ -1222,7 +1222,7 @@
12221222
buildActionMask = 2147483647;
12231223
files = (
12241224
2B1806D322AECF4300DD3DB1 /* Accelerate.framework in Frameworks */,
1225-
8F858B011E7FE7EB00037D4E /* WhirlyGlobeMaplyComponent.framework in Frameworks */,
1225+
8F858B011E7FE7EB00037D4E /* WhirlyGlobe.framework in Frameworks */,
12261226
E5D2D66E1DE6C26A00E02305 /* libc++.tbd in Frameworks */,
12271227
E5D2D66C1DE6C26000E02305 /* libz.tbd in Frameworks */,
12281228
E5D2D66A1DE6C25A00E02305 /* libxml2.tbd in Frameworks */,
@@ -1980,7 +1980,7 @@
19801980
8F858AF71E7FE60C00037D4E /* Products */ = {
19811981
isa = PBXGroup;
19821982
children = (
1983-
8F858AFC1E7FE60C00037D4E /* WhirlyGlobeMaplyComponent.framework */,
1983+
8F858AFC1E7FE60C00037D4E /* WhirlyGlobe.framework */,
19841984
8F858AFE1E7FE60C00037D4E /* WhirlyGlobeMaplyComponentTests.xctest */,
19851985
);
19861986
name = Products;
@@ -2081,10 +2081,10 @@
20812081
/* End PBXProject section */
20822082

20832083
/* Begin PBXReferenceProxy section */
2084-
8F858AFC1E7FE60C00037D4E /* WhirlyGlobeMaplyComponent.framework */ = {
2084+
8F858AFC1E7FE60C00037D4E /* WhirlyGlobe.framework */ = {
20852085
isa = PBXReferenceProxy;
20862086
fileType = wrapper.framework;
2087-
path = WhirlyGlobeMaplyComponent.framework;
2087+
path = WhirlyGlobe.framework;
20882088
remoteRef = 8F858AFB1E7FE60C00037D4E /* PBXContainerItemProxy */;
20892089
sourceTree = BUILT_PRODUCTS_DIR;
20902090
};
@@ -2839,7 +2839,6 @@
28392839
"\"$(SRCROOT)/../../../common/WhirlyGlobeLib/include\"",
28402840
);
28412841
INFOPLIST_FILE = AutoTester/Info.plist;
2842-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
28432842
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
28442843
MARKETING_VERSION = 3.1;
28452844
PRODUCT_BUNDLE_IDENTIFIER = com.mousebirdconsulting.AutoTesterApp;
@@ -2875,7 +2874,6 @@
28752874
"\"$(SRCROOT)/../../../common/WhirlyGlobeLib/include\"",
28762875
);
28772876
INFOPLIST_FILE = AutoTester/Info.plist;
2878-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
28792877
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
28802878
MARKETING_VERSION = 3.1;
28812879
PRODUCT_BUNDLE_IDENTIFIER = com.mousebirdconsulting.AutoTesterApp;

ios/library/WhirlyGlobe-MaplyComponent/WhirlyGlobeMaplyComponent.xcodeproj/project.pbxproj

-3
Original file line numberDiff line numberDiff line change
@@ -5196,10 +5196,8 @@
51965196
DYLIB_CURRENT_VERSION = 1;
51975197
DYLIB_INSTALL_NAME_BASE = "@rpath";
51985198
GCC_PREPROCESSOR_DEFINITIONS = (
5199-
"DEBUG=1",
52005199
"$(inherited)",
52015200
"HAVE_PTHREAD=1",
5202-
"UNORDERED=1",
52035201
__IPHONEOS__,
52045202
__USE_SDL_GLES__,
52055203
);
@@ -5254,7 +5252,6 @@
52545252
DYLIB_INSTALL_NAME_BASE = "@rpath";
52555253
GCC_PREPROCESSOR_DEFINITIONS = (
52565254
"HAVE_PTHREAD=1",
5257-
"UNORDERED=1",
52585255
__IPHONEOS__,
52595256
__USE_SDL_GLES__,
52605257
);

0 commit comments

Comments
 (0)