TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'xcode' of https://github.com/btb/dxx-rebirth into btb-xcode

Browse source
This commit is contained in:
Chris Taylor 2015-01-10 18:54:13 +08:00
parent 6a872da54a 86a6c40325
commit d302a40662
8 changed files with 2190 additions and 5090 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -42,8 +42,13 @@ ehthumbs.db
Thumbs.db
# Xcode generated files #
######################
#########################
# Note: committing these is optional
*.mode1v3
*.pbxuser
*.perspectivev3
xcuserdata
# PyCharm generated files #
###########################
.idea

1816
contrib/dxx-rebirth.xcodeproj/project.pbxproj Normal file
View file

File diff suppressed because it is too large Load diff

90
contrib/dxx-rebirth.xcodeproj/xcshareddata/xcschemes/d1x-rebirth-opengl.xcscheme Normal file
View file

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBC011A3256460041898B"
BuildableName = "d1x-rebirth-opengl"
BlueprintName = "d1x-rebirth-opengl"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "NO"
allowLocationSimulation = "YES">
<PathRunnable
FilePath = "/Users/bradleyb/src/descent/dxx-rebirth/build/d1x-rebirth-opengl/D1X-Rebirth.app">
</PathRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBC011A3256460041898B"
BuildableName = "d1x-rebirth-opengl"
BlueprintName = "d1x-rebirth-opengl"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
<CommandLineArgument
argument = "-debug"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "-window"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBC011A3256460041898B"
BuildableName = "d1x-rebirth-opengl"
BlueprintName = "d1x-rebirth-opengl"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

90
contrib/dxx-rebirth.xcodeproj/xcshareddata/xcschemes/d1x-rebirth-soft.xcscheme Normal file
View file

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBBFC1A32555F0041898B"
BuildableName = "d1x-rebirth-soft"
BlueprintName = "d1x-rebirth-soft"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "NO"
allowLocationSimulation = "YES">
<PathRunnable
FilePath = "/Users/bradleyb/src/descent/dxx-rebirth/build/d1x-rebirth-soft/D1X-Rebirth.app">
</PathRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBBFC1A32555F0041898B"
BuildableName = "d1x-rebirth-soft"
BlueprintName = "d1x-rebirth-soft"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
<CommandLineArgument
argument = "-debug"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "-window"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBBFC1A32555F0041898B"
BuildableName = "d1x-rebirth-soft"
BlueprintName = "d1x-rebirth-soft"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

94
contrib/dxx-rebirth.xcodeproj/xcshareddata/xcschemes/d2x-rebirth-opengl.xcscheme Normal file
View file

@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBC0B1A325B6B0041898B"
BuildableName = "d2x-rebirth-opengl"
BlueprintName = "d2x-rebirth-opengl"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "NO"
allowLocationSimulation = "YES">
<PathRunnable
FilePath = "/Users/bradleyb/src/descent/dxx-rebirth/build/d2x-rebirth-opengl/D2X-Rebirth.app">
</PathRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBC0B1A325B6B0041898B"
BuildableName = "d2x-rebirth-opengl"
BlueprintName = "d2x-rebirth-opengl"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
<CommandLineArgument
argument = "-debug"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "-window"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "-nomovies"
isEnabled = "NO">
</CommandLineArgument>
</CommandLineArguments>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBC0B1A325B6B0041898B"
BuildableName = "d2x-rebirth-opengl"
BlueprintName = "d2x-rebirth-opengl"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

94
contrib/dxx-rebirth.xcodeproj/xcshareddata/xcschemes/d2x-rebirth-soft.xcscheme Normal file
View file

@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBC061A325B680041898B"
BuildableName = "d2x-rebirth-soft"
BlueprintName = "d2x-rebirth-soft"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "NO"
allowLocationSimulation = "YES">
<PathRunnable
FilePath = "/Users/bradleyb/src/descent/dxx-rebirth/build/d2x-rebirth-soft/D2X-Rebirth.app">
</PathRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBC061A325B680041898B"
BuildableName = "d2x-rebirth-soft"
BlueprintName = "d2x-rebirth-soft"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
<CommandLineArgument
argument = "-debug"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "-window"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "-nomovies"
isEnabled = "NO">
</CommandLineArgument>
</CommandLineArguments>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "149EBC061A325B680041898B"
BuildableName = "d2x-rebirth-soft"
BlueprintName = "d2x-rebirth-soft"
ReferencedContainer = "container:dxx-rebirth.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

2486
d1x-rebirth/d1x-rebirth.xcodeproj/project.pbxproj
View file

File diff suppressed because it is too large Load diff

2603
d2x-rebirth/d2x-rebirth.xcodeproj/project.pbxproj
View file

File diff suppressed because it is too large Load diff