Skip to content

Instantly share code, notes, and snippets.

@dak180

dak180/index-on-master--1aa8ee2-Merge-branch--bugfixes-.patch

Forked from anonymous/index-on-master--1aa8ee2-Merge-branch--bugfixes-.patch
Created July 22, 2013 13:27
Show Gist options
  • Save dak180/6053793 to your computer and use it in GitHub Desktop.
Save dak180/6053793 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
index-on-master--1aa8ee2-Merge-branch--bugfixes-.patch
From 605e2b67a6ab7dedf87e170b220fb931dc932d96 Mon Sep 17 00:00:00 2001
From: dak180 <dak180@users.sourceforge.net>
Date: Mon, 22 Jul 2013 09:24:54 -0400
Subject: [PATCH] index on master: 1aa8ee2 Merge branch 'bugfixes'
---
...ke DMGs for Release.xcscheme => CS-ID.xcscheme} | 41 +++++++--------
...xcscheme => Fetch Third Party Sources.xcscheme} | 41 +++++++--------
.../xcschemes/Make DMGs for Release.xcscheme | 50 +++++++++++++-----
...xcscheme => Setup Prebuilt Components.xcscheme} | 41 +++++++--------
.../xcshareddata/xcschemes/Warzone.xcscheme | 29 ++++++++---
.../xcshareddata/WorkspaceSettings.xcsettings | 8 +++
.../fetchscripts/SetupPrebuiltComponents-CS-ID.sh | 2 +-
tests/Tests.xcodeproj/.gitignore | 2 +
.../xcshareddata/xcschemes/All Tests.xcscheme | 29 ++++++-----
.../xcshareddata/xcschemes/qslint.xcscheme | 60 +++++++++++++---------
tests/configs/Project-All.xcconfig | 6 +--
tools/map/MapUtilities.xcodeproj/.gitignore | 2 +
.../xcshareddata/xcschemes/All Tools.xcscheme | 29 ++++++-----
.../xcshareddata/xcschemes/map2lnd.xcscheme | 60 +++++++++++++---------
.../xcshareddata/xcschemes/map2png.xcscheme | 60 +++++++++++++---------
.../xcshareddata/xcschemes/map2preview.xcscheme | 60 +++++++++++++---------
.../xcshareddata/xcschemes/mapconv.xcscheme | 60 +++++++++++++---------
.../xcshareddata/xcschemes/mapinfo.xcscheme | 60 +++++++++++++---------
tools/map/configs/Project-All.xcconfig | 6 +--
19 files changed, 377 insertions(+), 269 deletions(-)
copy macosx/Warzone.xcodeproj/xcshareddata/xcschemes/{Make DMGs for Release.xcscheme => CS-ID.xcscheme} (66%)
copy macosx/Warzone.xcodeproj/xcshareddata/xcschemes/{Make DMGs for Release.xcscheme => Fetch Third Party Sources.xcscheme} (65%)
copy macosx/Warzone.xcodeproj/xcshareddata/xcschemes/{Make DMGs for Release.xcscheme => Setup Prebuilt Components.xcscheme} (65%)
create mode 100644 macosx/Warzone.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
create mode 100644 tests/Tests.xcodeproj/.gitignore
copy macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme => tests/Tests.xcodeproj/xcshareddata/xcschemes/All Tests.xcscheme (73%)
copy macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme => tests/Tests.xcodeproj/xcshareddata/xcschemes/qslint.xcscheme (55%)
create mode 100644 tools/map/MapUtilities.xcodeproj/.gitignore
copy macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme => tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/All Tools.xcscheme (73%)
copy macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme => tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2lnd.xcscheme (54%)
copy macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme => tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2png.xcscheme (54%)
copy macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme => tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2preview.xcscheme (54%)
copy macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme => tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapconv.xcscheme (54%)
copy macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme => tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapinfo.xcscheme (54%)
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme b/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/CS-ID.xcscheme
similarity index 66%
copy from macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
copy to macosx/Warzone.xcodeproj/xcshareddata/xcschemes/CS-ID.xcscheme
index 1e3a700..b91e441 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
+++ b/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/CS-ID.xcscheme
@@ -1,55 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
+ buildForTesting = "NO"
+ buildForRunning = "NO"
+ buildForProfiling = "NO"
+ buildForArchiving = "NO"
+ buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "43F77C7710F0125E00E04615"
- BuildableName = "Make DMGs for Release"
- BlueprintName = "Make DMGs for Release"
+ BlueprintIdentifier = "430104BC1698E449006D4583"
+ BuildableName = "CS-ID"
+ BlueprintName = "CS-ID"
ReferencedContainer = "container:Warzone.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
+ buildConfiguration = "Release">
<Testables>
</Testables>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug">
+ buildConfiguration = "Release"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
- buildConfiguration = "Debug">
+ buildConfiguration = "Release">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme b/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Fetch Third Party Sources.xcscheme
similarity index 65%
copy from macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
copy to macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Fetch Third Party Sources.xcscheme
index 1e3a700..8f57be8 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
+++ b/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Fetch Third Party Sources.xcscheme
@@ -1,55 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
+ buildForTesting = "NO"
+ buildForRunning = "NO"
+ buildForProfiling = "NO"
+ buildForArchiving = "NO"
+ buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "43F77C7710F0125E00E04615"
- BuildableName = "Make DMGs for Release"
- BlueprintName = "Make DMGs for Release"
+ BlueprintIdentifier = "438B0C05137730FE008184FC"
+ BuildableName = "Fetch Third Party Sources"
+ BlueprintName = "Fetch Third Party Sources"
ReferencedContainer = "container:Warzone.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
+ buildConfiguration = "Release">
<Testables>
</Testables>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug">
+ buildConfiguration = "Release"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
- buildConfiguration = "Debug">
+ buildConfiguration = "Release">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme b/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
index 1e3a700..5cd274c 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
+++ b/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- version = "1.3">
+ version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
+ buildForTesting = "NO"
+ buildForRunning = "NO"
+ buildForProfiling = "NO"
+ buildForArchiving = "NO"
+ buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "43F77C7710F0125E00E04615"
@@ -22,21 +22,42 @@
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
+ buildConfiguration = "Release">
<Testables>
</Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "02356D740BD3BB3400E9A019"
+ BuildableName = "Warzone.app"
+ BlueprintName = "Warzone"
+ ReferencedContainer = "container:Warzone.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
displayScaleIsEnabled = "NO"
displayScale = "1.00"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug">
+ buildConfiguration = "Release"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "02356D740BD3BB3400E9A019"
+ BuildableName = "Warzone.app"
+ BlueprintName = "Warzone"
+ ReferencedContainer = "container:Warzone.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
@@ -46,10 +67,11 @@
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
- buildConfiguration = "Debug">
+ buildConfiguration = "Release">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme b/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Setup Prebuilt Components.xcscheme
similarity index 65%
copy from macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
copy to macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Setup Prebuilt Components.xcscheme
index 1e3a700..a068d88 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
+++ b/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Setup Prebuilt Components.xcscheme
@@ -1,55 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
+ buildForTesting = "NO"
+ buildForRunning = "NO"
+ buildForProfiling = "NO"
+ buildForArchiving = "NO"
+ buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "43F77C7710F0125E00E04615"
- BuildableName = "Make DMGs for Release"
- BlueprintName = "Make DMGs for Release"
+ BlueprintIdentifier = "43FA570C10FF8E9B0074E914"
+ BuildableName = "Setup Prebuilt Components"
+ BlueprintName = "Setup Prebuilt Components"
ReferencedContainer = "container:Warzone.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
+ buildConfiguration = "Release">
<Testables>
</Testables>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug">
+ buildConfiguration = "Release"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
- buildConfiguration = "Debug">
+ buildConfiguration = "Release">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme b/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
index 252ac3e..b5c0b1f 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
+++ b/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- version = "1.3">
+ version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -22,21 +22,33 @@
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "02356D740BD3BB3400E9A019"
+ BuildableName = "Warzone.app"
+ BlueprintName = "Warzone"
+ ReferencedContainer = "container:Warzone.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
displayScaleIsEnabled = "NO"
displayScale = "1.00"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
@@ -55,7 +67,8 @@
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
@@ -67,7 +80,7 @@
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
- buildConfiguration = "Debug">
+ buildConfiguration = "StaticAnalyzer">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
diff --git a/macosx/Warzone.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/macosx/Warzone.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 0000000..08de0be
--- /dev/null
+++ b/macosx/Warzone.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +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>
+ <key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+ <false/>
+</dict>
+</plist>
diff --git a/macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh b/macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh
index 8ccfab6..ed5f44a 100755
--- a/macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh
+++ b/macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh
@@ -1,7 +1,7 @@
#!/bin/sh
if [ ! -f configs/CS-ID.xcconfig ]; then
- cat <<EOF > configs/CS-ID.xcconfig
+ cat > configs/CS-ID.xcconfig <<'EOF'
// Global settings for Code Signing
CODE_SIGN_IDENTITY =
diff --git a/tests/Tests.xcodeproj/.gitignore b/tests/Tests.xcodeproj/.gitignore
new file mode 100644
index 0000000..06fb5d4
--- /dev/null
+++ b/tests/Tests.xcodeproj/.gitignore
@@ -0,0 +1,2 @@
+xcuserdata/*
+project.xcworkspace/xcuserdata/*
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme b/tests/Tests.xcodeproj/xcshareddata/xcschemes/All Tests.xcscheme
similarity index 73%
copy from macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
copy to tests/Tests.xcodeproj/xcshareddata/xcschemes/All Tests.xcscheme
index 1e3a700..ae3157a 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
+++ b/tests/Tests.xcodeproj/xcshareddata/xcschemes/All Tests.xcscheme
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -13,40 +14,40 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "43F77C7710F0125E00E04615"
- BuildableName = "Make DMGs for Release"
- BlueprintName = "Make DMGs for Release"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "43E7009A14F9829600D419C5"
+ BuildableName = "All Tests"
+ BlueprintName = "All Tests"
+ ReferencedContainer = "container:Tests.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug">
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme b/tests/Tests.xcodeproj/xcshareddata/xcschemes/qslint.xcscheme
similarity index 55%
copy from macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
copy to tests/Tests.xcodeproj/xcshareddata/xcschemes/qslint.xcscheme
index 252ac3e..0a78e85 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
+++ b/tests/Tests.xcodeproj/xcshareddata/xcschemes/qslint.xcscheme
@@ -1,68 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
- buildForTesting = "NO"
+ buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
- buildForArchiving = "NO"
- buildForAnalyzing = "NO">
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "43E700FF14F9887F00D419C5"
+ BuildableName = "qslint"
+ BlueprintName = "qslint"
+ ReferencedContainer = "container:Tests.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "43E700FF14F9887F00D419C5"
+ BuildableName = "qslint"
+ BlueprintName = "qslint"
+ ReferencedContainer = "container:Tests.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "43E700FF14F9887F00D419C5"
+ BuildableName = "qslint"
+ BlueprintName = "qslint"
+ ReferencedContainer = "container:Tests.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "43E700FF14F9887F00D419C5"
+ BuildableName = "qslint"
+ BlueprintName = "qslint"
+ ReferencedContainer = "container:Tests.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
diff --git a/tests/configs/Project-All.xcconfig b/tests/configs/Project-All.xcconfig
index 74a1c2e..194d19a 100644
--- a/tests/configs/Project-All.xcconfig
+++ b/tests/configs/Project-All.xcconfig
@@ -2,12 +2,10 @@
ARCHS = i386 x86_64
-SDKROOT = macosx10.5
-SDKROOT[arch=x86_64] = macosx10.6
+SDKROOT = macosx
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
GCC_VERSION = com.apple.compilers.llvm.clang.1_0
-MACOSX_DEPLOYMENT_TARGET = 10.5
-MACOSX_DEPLOYMENT_TARGET[sdk=macosx10.6] = 10.6
+MACOSX_DEPLOYMENT_TARGET = 10.6
COPY_PHASE_STRIP = NO
DEAD_CODE_STRIPPING = YES
GCC_AUTO_VECTORIZATION = YES
diff --git a/tools/map/MapUtilities.xcodeproj/.gitignore b/tools/map/MapUtilities.xcodeproj/.gitignore
new file mode 100644
index 0000000..06fb5d4
--- /dev/null
+++ b/tools/map/MapUtilities.xcodeproj/.gitignore
@@ -0,0 +1,2 @@
+xcuserdata/*
+project.xcworkspace/xcuserdata/*
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/All Tools.xcscheme
similarity index 73%
copy from macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
copy to tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/All Tools.xcscheme
index 1e3a700..f20e2e3 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for Release.xcscheme
+++ b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/All Tools.xcscheme
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -13,40 +14,40 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "43F77C7710F0125E00E04615"
- BuildableName = "Make DMGs for Release"
- BlueprintName = "Make DMGs for Release"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C9613149BDA19001BAF3A"
+ BuildableName = "All Tools"
+ BlueprintName = "All Tools"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug">
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2lnd.xcscheme
similarity index 54%
copy from macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
copy to tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2lnd.xcscheme
index 252ac3e..9680711 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
+++ b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2lnd.xcscheme
@@ -1,68 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
- buildForTesting = "NO"
+ buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
- buildForArchiving = "NO"
- buildForAnalyzing = "NO">
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C9544149BD280001BAF3A"
+ BuildableName = "map2lnd"
+ BlueprintName = "map2lnd"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "438C9544149BD280001BAF3A"
+ BuildableName = "map2lnd"
+ BlueprintName = "map2lnd"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C9544149BD280001BAF3A"
+ BuildableName = "map2lnd"
+ BlueprintName = "map2lnd"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C9544149BD280001BAF3A"
+ BuildableName = "map2lnd"
+ BlueprintName = "map2lnd"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2png.xcscheme
similarity index 54%
copy from macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
copy to tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2png.xcscheme
index 252ac3e..ada4394 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
+++ b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2png.xcscheme
@@ -1,68 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
- buildForTesting = "NO"
+ buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
- buildForArchiving = "NO"
- buildForAnalyzing = "NO">
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C94E3149BD19D001BAF3A"
+ BuildableName = "map2png"
+ BlueprintName = "map2png"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "438C94E3149BD19D001BAF3A"
+ BuildableName = "map2png"
+ BlueprintName = "map2png"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C94E3149BD19D001BAF3A"
+ BuildableName = "map2png"
+ BlueprintName = "map2png"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C94E3149BD19D001BAF3A"
+ BuildableName = "map2png"
+ BlueprintName = "map2png"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2preview.xcscheme
similarity index 54%
copy from macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
copy to tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2preview.xcscheme
index 252ac3e..d1c045c 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
+++ b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2preview.xcscheme
@@ -1,68 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
- buildForTesting = "NO"
+ buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
- buildForArchiving = "NO"
- buildForAnalyzing = "NO">
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C954C149BD290001BAF3A"
+ BuildableName = "map2preview"
+ BlueprintName = "map2preview"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "438C954C149BD290001BAF3A"
+ BuildableName = "map2preview"
+ BlueprintName = "map2preview"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C954C149BD290001BAF3A"
+ BuildableName = "map2preview"
+ BlueprintName = "map2preview"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C954C149BD290001BAF3A"
+ BuildableName = "map2preview"
+ BlueprintName = "map2preview"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapconv.xcscheme
similarity index 54%
copy from macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
copy to tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapconv.xcscheme
index 252ac3e..d48860a 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
+++ b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapconv.xcscheme
@@ -1,68 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
- buildForTesting = "NO"
+ buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
- buildForArchiving = "NO"
- buildForAnalyzing = "NO">
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C952C149BD22C001BAF3A"
+ BuildableName = "mapconv"
+ BlueprintName = "mapconv"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "438C952C149BD22C001BAF3A"
+ BuildableName = "mapconv"
+ BlueprintName = "mapconv"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C952C149BD22C001BAF3A"
+ BuildableName = "mapconv"
+ BlueprintName = "mapconv"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C952C149BD22C001BAF3A"
+ BuildableName = "mapconv"
+ BlueprintName = "mapconv"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
diff --git a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapinfo.xcscheme
similarity index 54%
copy from macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
copy to tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapinfo.xcscheme
index 252ac3e..c300b4d 100644
--- a/macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
+++ b/tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapinfo.xcscheme
@@ -1,68 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
- buildForTesting = "NO"
+ buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
- buildForArchiving = "NO"
- buildForAnalyzing = "NO">
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C953C149BD26C001BAF3A"
+ BuildableName = "mapinfo"
+ BlueprintName = "mapinfo"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "438C953C149BD26C001BAF3A"
+ BuildableName = "mapinfo"
+ BlueprintName = "mapinfo"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C953C149BD26C001BAF3A"
+ BuildableName = "mapinfo"
+ BlueprintName = "mapinfo"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
- displayScaleIsEnabled = "NO"
- displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release">
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "02356D740BD3BB3400E9A019"
- BuildableName = "Warzone.app"
- BlueprintName = "Warzone"
- ReferencedContainer = "container:Warzone.xcodeproj">
+ BlueprintIdentifier = "438C953C149BD26C001BAF3A"
+ BuildableName = "mapinfo"
+ BlueprintName = "mapinfo"
+ ReferencedContainer = "container:MapUtilities.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
diff --git a/tools/map/configs/Project-All.xcconfig b/tools/map/configs/Project-All.xcconfig
index f13c140..58912ce 100644
--- a/tools/map/configs/Project-All.xcconfig
+++ b/tools/map/configs/Project-All.xcconfig
@@ -2,12 +2,10 @@
ARCHS = i386 x86_64
-SDKROOT = macosx10.5
-SDKROOT[arch=x86_64] = macosx10.6
+SDKROOT = macosx
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
GCC_VERSION = com.apple.compilers.llvm.clang.1_0
-MACOSX_DEPLOYMENT_TARGET = 10.5
-MACOSX_DEPLOYMENT_TARGET[sdk=macosx10.6] = 10.6
+MACOSX_DEPLOYMENT_TARGET = 10.6
COPY_PHASE_STRIP = NO
DEAD_CODE_STRIPPING = YES
GCC_AUTO_VECTORIZATION = YES
--
1.8.3.3+GitX
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment