okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrades to Xcode project and Apple Silicon support

Browse source 
- Reorganized Xcode project
- Added missionpack support to Xcode project
- Incorporated changes from MaddTheSane for Apple Silicon support https://github.com/maddthesane/ioq3
- Built SDL 2.0.14 for Apple Siicon, added to existing SDL dylib
- Built SDLMain for Apple Silicon, added to existing libSDL2main.a
This commit is contained in:
Tom Kidd 2021-01-28 17:37:23 -06:00
parent b8be5a8bd7
commit 52a43ae1c4
42 changed files with 936 additions and 756 deletions
Download patch file Download diff file Expand all files Collapse all files

5
misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
<dict>
<key>PreviewsEnabled</key>
<false/>
</dict>
</plist>

57
misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all game.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1110"
LastUpgradeVersion = "1230"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -16,7 +16,21 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "2735319414D125FD00EB7BD6"
BuildableName = "cgame.dylib"
BlueprintName = "cgame"
BlueprintName = "cgame - baseq3"
ReferencedContainer = "container:cgame.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A137C9C6258DCEE8009AC639"
BuildableName = "cgame.dylib"
BlueprintName = "cgame - missionpack"
ReferencedContainer = "container:cgame.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@ -29,8 +43,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "273531B314D126C300EB7BD6"
BuildableName = "game.dylib"
BlueprintName = "game"
BuildableName = "qagame.dylib"
BlueprintName = "game - baseq3"
ReferencedContainer = "container:game.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@ -42,10 +56,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "273531C614D1270700EB7BD6"
BuildableName = "q3_ui.dylib"
BlueprintName = "q3_ui"
ReferencedContainer = "container:q3_ui.xcodeproj">
BlueprintIdentifier = "A137C98D258DCD55009AC639"
BuildableName = "qagame.dylib"
BlueprintName = "game - missionpack"
ReferencedContainer = "container:game.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
@ -58,7 +72,21 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "273531D814D1272300EB7BD6"
BuildableName = "ui.dylib"
BlueprintName = "ui"
BlueprintName = "ui - missionpack"
ReferencedContainer = "container:ui.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A137C91B258DC8DF009AC639"
BuildableName = "ui.dylib"
BlueprintName = "ui - baseq3"
ReferencedContainer = "container:ui.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@ -87,7 +115,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "2735319414D125FD00EB7BD6"
BuildableName = "cgame.dylib"
BlueprintName = "cgame"
BlueprintName = "cgame - baseq3"
ReferencedContainer = "container:cgame.xcodeproj">
</BuildableReference>
</MacroExpansion>
@ -98,6 +126,15 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2735319414D125FD00EB7BD6"
BuildableName = "cgame.dylib"
BlueprintName = "cgame - baseq3"
ReferencedContainer = "container:cgame.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">

65
misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all ioquake3.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1110"
LastUpgradeVersion = "1230"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -16,7 +16,21 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "2735319414D125FD00EB7BD6"
BuildableName = "cgame.dylib"
BlueprintName = "cgame"
BlueprintName = "cgame - baseq3"
ReferencedContainer = "container:cgame.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A137C9C6258DCEE8009AC639"
BuildableName = "cgame.dylib"
BlueprintName = "cgame - missionpack"
ReferencedContainer = "container:cgame.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@ -29,8 +43,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "273531B314D126C300EB7BD6"
BuildableName = "game.dylib"
BlueprintName = "game"
BuildableName = "qagame.dylib"
BlueprintName = "game - baseq3"
ReferencedContainer = "container:game.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@ -42,10 +56,24 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "273531C614D1270700EB7BD6"
BuildableName = "q3_ui.dylib"
BlueprintName = "q3_ui"
ReferencedContainer = "container:q3_ui.xcodeproj">
BlueprintIdentifier = "A137C98D258DCD55009AC639"
BuildableName = "qagame.dylib"
BlueprintName = "game - missionpack"
ReferencedContainer = "container:game.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A137C91B258DC8DF009AC639"
BuildableName = "ui.dylib"
BlueprintName = "ui - baseq3"
ReferencedContainer = "container:ui.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
@ -58,7 +86,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "273531D814D1272300EB7BD6"
BuildableName = "ui.dylib"
BlueprintName = "ui"
BlueprintName = "ui - missionpack"
ReferencedContainer = "container:ui.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@ -126,10 +154,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2758BA56179059C1007F6582"
BuildableName = "libspeex.a"
BlueprintName = "speex"
ReferencedContainer = "container:speex.xcodeproj">
BlueprintIdentifier = "A1665093218BF75B0086B74B"
BuildableName = "libopus.dylib"
BlueprintName = "opus"
ReferencedContainer = "container:opus.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
@ -171,7 +199,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "2735319414D125FD00EB7BD6"
BuildableName = "cgame.dylib"
BlueprintName = "cgame"
BlueprintName = "cgame - baseq3"
ReferencedContainer = "container:cgame.xcodeproj">
</BuildableReference>
</MacroExpansion>
@ -182,6 +210,15 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2735319414D125FD00EB7BD6"
BuildableName = "cgame.dylib"
BlueprintName = "cgame - baseq3"
ReferencedContainer = "container:cgame.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">