Skip to content

Commit 7ca5284

Browse files
xplanexplane
xplane
authored and
xplane
committed
fix libsquish for DDSTool/ObjView/WED builds on aarch64
1 parent 8d3aa19 commit 7ca5284

File tree

6 files changed

+259
-33
lines changed

6 files changed

+259
-33
lines changed

‎SceneryTools.xcodeproj/project.pbxproj

+30-26
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@
1313
buildPhases = (
1414
);
1515
dependencies = (
16-
D60734330D197A2300E08F61 /* PBXTargetDependency */,
1716
D61C26EF0B6155A10092E098 /* PBXTargetDependency */,
1817
D61C26ED0B61559E0092E098 /* PBXTargetDependency */,
1918
D61C26EB0B61559C0092E098 /* PBXTargetDependency */,
2019
D66FD87A0C933D39004AD565 /* PBXTargetDependency */,
21-
D6C68DDC0BEFB3A400C9F880 /* PBXTargetDependency */,
2220
);
2321
name = "Build Tools";
2422
productName = Untitled;
@@ -927,13 +925,6 @@
927925
/* End PBXBuildFile section */
928926

929927
/* Begin PBXContainerItemProxy section */
930-
D60734320D197A2300E08F61 /* PBXContainerItemProxy */ = {
931-
isa = PBXContainerItemProxy;
932-
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
933-
proxyType = 1;
934-
remoteGlobalIDString = D60734100D197A1100E08F61;
935-
remoteInfo = MeshTool;
936-
};
937928
D60734340D197A2700E08F61 /* PBXContainerItemProxy */ = {
938929
isa = PBXContainerItemProxy;
939930
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
@@ -969,13 +960,6 @@
969960
remoteGlobalIDString = D6C579BC0C7E3C7B00FCB4C1;
970961
remoteInfo = DDSTool;
971962
};
972-
D6C68DDB0BEFB3A400C9F880 /* PBXContainerItemProxy */ = {
973-
isa = PBXContainerItemProxy;
974-
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
975-
proxyType = 1;
976-
remoteGlobalIDString = D6ED369A0B67964D00D5484E;
977-
remoteInfo = WED;
978-
};
979963
D6C68DE00BEFB3BE00C9F880 /* PBXContainerItemProxy */ = {
980964
isa = PBXContainerItemProxy;
981965
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
@@ -4914,11 +4898,6 @@
49144898
/* End PBXSourcesBuildPhase section */
49154899

49164900
/* Begin PBXTargetDependency section */
4917-
D60734330D197A2300E08F61 /* PBXTargetDependency */ = {
4918-
isa = PBXTargetDependency;
4919-
target = D60734100D197A1100E08F61 /* MeshTool */;
4920-
targetProxy = D60734320D197A2300E08F61 /* PBXContainerItemProxy */;
4921-
};
49224901
D60734350D197A2700E08F61 /* PBXTargetDependency */ = {
49234902
isa = PBXTargetDependency;
49244903
target = D60734100D197A1100E08F61 /* MeshTool */;
@@ -4944,11 +4923,6 @@
49444923
target = D6C579BC0C7E3C7B00FCB4C1 /* DDSTool */;
49454924
targetProxy = D66FD8790C933D39004AD565 /* PBXContainerItemProxy */;
49464925
};
4947-
D6C68DDC0BEFB3A400C9F880 /* PBXTargetDependency */ = {
4948-
isa = PBXTargetDependency;
4949-
target = D6ED369A0B67964D00D5484E /* WED */;
4950-
targetProxy = D6C68DDB0BEFB3A400C9F880 /* PBXContainerItemProxy */;
4951-
};
49524926
D6C68DE10BEFB3BE00C9F880 /* PBXTargetDependency */ = {
49534927
isa = PBXTargetDependency;
49544928
target = D65E4B200B65427C004D7887 /* RenderFarm */;
@@ -5480,6 +5454,8 @@
54805454
OTHER_LDFLAGS = (
54815455
libs/local/lib/libsquish.a,
54825456
libs/local/lib/libpng.a,
5457+
libs/local/lib/libjpeg.a,
5458+
libs/local/lib/libtiff.a,
54835459
);
54845460
};
54855461
name = Phone;
@@ -5541,6 +5517,7 @@
55415517
buildSettings = {
55425518
CLANG_ENABLE_OBJC_WEAK = YES;
55435519
COPY_PHASE_STRIP = NO;
5520+
ENABLE_TESTABILITY = NO;
55445521
GCC_DYNAMIC_NO_PIC = NO;
55455522
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
55465523
GCC_OPTIMIZATION_LEVEL = 0;
@@ -5555,6 +5532,7 @@
55555532
CLANG_ENABLE_OBJC_WEAK = YES;
55565533
COPY_PHASE_STRIP = YES;
55575534
ENABLE_HARDENED_RUNTIME = YES;
5535+
ENABLE_TESTABILITY = NO;
55585536
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
55595537
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
55605538
PRODUCT_NAME = Untitled;
@@ -5750,9 +5728,17 @@
57505728
CODE_SIGN_IDENTITY = "-";
57515729
DEVELOPMENT_TEAM = "";
57525730
ENABLE_HARDENED_RUNTIME = NO;
5731+
GCC_PREPROCESSOR_DEFINITIONS = (
5732+
"DEV=1",
5733+
"APL=1",
5734+
"USE_TIF=1",
5735+
"USE_JPEG=1",
5736+
);
57535737
OTHER_LDFLAGS = (
57545738
libs/local/lib/libsquish.a,
57555739
libs/local/lib/libpng.a,
5740+
libs/local/lib/libjpeg.a,
5741+
libs/local/lib/libtiff.a,
57565742
);
57575743
};
57585744
name = Debug;
@@ -5764,9 +5750,18 @@
57645750
CODE_SIGN_IDENTITY = "-";
57655751
DEVELOPMENT_TEAM = "";
57665752
ENABLE_HARDENED_RUNTIME = YES;
5753+
GCC_PREPROCESSOR_DEFINITIONS = (
5754+
NDEBUG,
5755+
"DEV=0",
5756+
"APL=1",
5757+
"USE_TIF=1",
5758+
"USE_JPEG=1",
5759+
);
57675760
OTHER_LDFLAGS = (
57685761
libs/local/lib/libsquish.a,
57695762
libs/local/lib/libpng.a,
5763+
libs/local/lib/libjpeg.a,
5764+
libs/local/lib/libtiff.a,
57705765
);
57715766
};
57725767
name = Release;
@@ -5959,9 +5954,17 @@
59595954
CODE_SIGN_IDENTITY = "-";
59605955
DEVELOPMENT_TEAM = "";
59615956
ENABLE_HARDENED_RUNTIME = NO;
5957+
GCC_PREPROCESSOR_DEFINITIONS = (
5958+
"DEV=1",
5959+
"APL=1",
5960+
"USE_TIF=1",
5961+
"USE_JPEG=1",
5962+
);
59625963
OTHER_LDFLAGS = (
59635964
libs/local/lib/libsquish.a,
59645965
libs/local/lib/libpng.a,
5966+
libs/local/lib/libjpeg.a,
5967+
libs/local/lib/libtiff.a,
59655968
);
59665969
};
59675970
name = DebugOpt;
@@ -6059,6 +6062,7 @@
60596062
buildSettings = {
60606063
CLANG_ENABLE_OBJC_WEAK = YES;
60616064
COPY_PHASE_STRIP = NO;
6065+
ENABLE_TESTABILITY = NO;
60626066
GCC_DYNAMIC_NO_PIC = NO;
60636067
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
60646068
GCC_OPTIMIZATION_LEVEL = 0;

‎SceneryTools.xcodeproj/xcshareddata/xcschemes/Build Tools.xcscheme

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1240"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "D61C26E70B6155960092E098"
18+
BuildableName = "Build Tools"
19+
BlueprintName = "Build Tools"
20+
ReferencedContainer = "container:SceneryTools.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Release"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "D61C26E70B6155960092E098"
54+
BuildableName = "Build Tools"
55+
BlueprintName = "Build Tools"
56+
ReferencedContainer = "container:SceneryTools.xcodeproj">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎SceneryTools.xcodeproj/xcshareddata/xcschemes/DDSTool.xcscheme

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1240"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "D6C579BC0C7E3C7B00FCB4C1"
18+
BuildableName = "DDSTool"
19+
BlueprintName = "DDSTool"
20+
ReferencedContainer = "container:SceneryTools.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
<BuildableProductRunnable
44+
runnableDebuggingMode = "0">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "D6C579BC0C7E3C7B00FCB4C1"
48+
BuildableName = "DDSTool"
49+
BlueprintName = "DDSTool"
50+
ReferencedContainer = "container:SceneryTools.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "D6C579BC0C7E3C7B00FCB4C1"
65+
BuildableName = "DDSTool"
66+
BlueprintName = "DDSTool"
67+
ReferencedContainer = "container:SceneryTools.xcodeproj">
68+
</BuildableReference>
69+
</BuildableProductRunnable>
70+
</ProfileAction>
71+
<AnalyzeAction
72+
buildConfiguration = "Debug">
73+
</AnalyzeAction>
74+
<ArchiveAction
75+
buildConfiguration = "Release"
76+
revealArchiveInOrganizer = "YES">
77+
</ArchiveAction>
78+
</Scheme>

‎SceneryTools.xcodeproj/xcshareddata/xcschemes/WED.xcscheme

+5-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<BuildActionEntry
1010
buildForTesting = "YES"
1111
buildForRunning = "YES"
12-
buildForProfiling = "YES"
12+
buildForProfiling = "NO"
1313
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
14+
buildForAnalyzing = "NO">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "D6ED369A0B67964D00D5484E"
@@ -31,7 +31,7 @@
3131
</Testables>
3232
</TestAction>
3333
<LaunchAction
34-
buildConfiguration = "Debug"
34+
buildConfiguration = "Release"
3535
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3636
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
3737
launchStyle = "0"
@@ -57,16 +57,15 @@
5757
savedToolIdentifier = ""
5858
useCustomWorkingDirectory = "NO"
5959
debugDocumentVersioning = "YES">
60-
<BuildableProductRunnable
61-
runnableDebuggingMode = "0">
60+
<MacroExpansion>
6261
<BuildableReference
6362
BuildableIdentifier = "primary"
6463
BlueprintIdentifier = "D6ED369A0B67964D00D5484E"
6564
BuildableName = "WED.app"
6665
BlueprintName = "WED"
6766
ReferencedContainer = "container:SceneryTools.xcodeproj">
6867
</BuildableReference>
69-
</BuildableProductRunnable>
68+
</MacroExpansion>
7069
</ProfileAction>
7170
<AnalyzeAction
7271
buildConfiguration = "Debug">

0 commit comments

Comments
 (0)