https://github.com/libsdl-org/Maelstrom/commit/4715fb93484633fec6c69bfc0ddca8f6caf37617
From 4715fb93484633fec6c69bfc0ddca8f6caf37617 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Fri, 6 Jul 2012 19:34:49 -0400
Subject: [PATCH] Updated with Ambrosia Software's third party library
locations
---
Xcode-iOS/Maelstrom.xcodeproj/project.pbxproj | 4 +---
Xcode-iOS/Maelstrom.xcworkspace/contents.xcworkspacedata | 8 ++++----
Xcode-iOS/physfs/physfs.xcodeproj/project.pbxproj | 6 +++++-
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Xcode-iOS/Maelstrom.xcodeproj/project.pbxproj b/Xcode-iOS/Maelstrom.xcodeproj/project.pbxproj
index faa7dccf..0fdbf087 100644
--- a/Xcode-iOS/Maelstrom.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/Maelstrom.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
93D8E49B15911A6700BD8D0E /* libSDL2_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 938A44A2157D55870081A436 /* libSDL2_net.a */; };
93D8E49C15911A6C00BD8D0E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 938A44AE157D55AE0081A436 /* libSDL2.a */; };
93D8E49D15911A7400BD8D0E /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 93D8E493159116B400BD8D0E /* libphysfs.a */; };
- 93D8E4A415911CDC00BD8D0E /* Maelstrom-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 93D8E4A315911CDC00BD8D0E /* Maelstrom-Info.plist */; };
AA0777CE145EB56C00DB8DB3 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA0777CD145EB56C00DB8DB3 /* OpenGLES.framework */; };
AA0777D2145EB60A00DB8DB3 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA0777D1145EB60A00DB8DB3 /* AudioToolbox.framework */; };
AA0777D4145EB68300DB8DB3 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA0777D3145EB68300DB8DB3 /* QuartzCore.framework */; };
@@ -677,7 +676,7 @@
AAD13B74145E8A8F0040B19C /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0430;
};
buildConfigurationList = AAD13B77145E8A8F0040B19C /* Build configuration list for PBXProject "Maelstrom" */;
compatibilityVersion = "Xcode 3.2";
@@ -751,7 +750,6 @@
AA319E20145EDA6400384943 /* Maelstrom_small.png in Resources */,
AA769FE0146A679C001C5008 /* Maelstrom_ipad.png in Resources */,
AA9781BC1576A14D00472542 /* Maelstrom_Data.zip in Resources */,
- 93D8E4A415911CDC00BD8D0E /* Maelstrom-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/Xcode-iOS/Maelstrom.xcworkspace/contents.xcworkspacedata b/Xcode-iOS/Maelstrom.xcworkspace/contents.xcworkspacedata
index b94d7ed1..856df1c8 100644
--- a/Xcode-iOS/Maelstrom.xcworkspace/contents.xcworkspacedata
+++ b/Xcode-iOS/Maelstrom.xcworkspace/contents.xcworkspacedata
@@ -2,15 +2,15 @@
<Workspace
version = "1.0">
<FileRef
- location = "group:physfs/physfs.xcodeproj">
+ location = "group:Maelstrom.xcodeproj">
</FileRef>
<FileRef
- location = "group:../../SDL_net/Xcode-iOS/SDL_net.xcodeproj">
+ location = "group:../../../../../3rdparty/iphone/SDL/Xcode-iOS/SDL/SDL.xcodeproj">
</FileRef>
<FileRef
- location = "group:../../SDL/Xcode-iOS/SDL/SDL.xcodeproj">
+ location = "group:../../../../../3rdparty/iphone/SDL_net/Xcode-iOS/SDL_net.xcodeproj">
</FileRef>
<FileRef
- location = "group:Maelstrom.xcodeproj">
+ location = "group:physfs/physfs.xcodeproj">
</FileRef>
</Workspace>
diff --git a/Xcode-iOS/physfs/physfs.xcodeproj/project.pbxproj b/Xcode-iOS/physfs/physfs.xcodeproj/project.pbxproj
index 82b8a7c8..08bb5010 100644
--- a/Xcode-iOS/physfs/physfs.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/physfs/physfs.xcodeproj/project.pbxproj
@@ -230,7 +230,7 @@
AAD14072145EA8C90040B19C /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0430;
};
buildConfigurationList = AAD14075145EA8C90040B19C /* Build configuration list for PBXProject "physfs" */;
compatibilityVersion = "Xcode 3.2";
@@ -299,6 +299,7 @@
armv7,
);
GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_THUMB_SUPPORT = NO;
IPHONEOS_DEPLOYMENT_TARGET = 3.0;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -312,6 +313,7 @@
armv6,
armv7,
);
+ GCC_THUMB_SUPPORT = NO;
IPHONEOS_DEPLOYMENT_TARGET = 3.0;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -323,6 +325,7 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = "PHYSFS_SUPPORTS_ZIP=1";
+ GCC_THUMB_SUPPORT = NO;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -332,6 +335,7 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = "PHYSFS_SUPPORTS_ZIP=1";
+ GCC_THUMB_SUPPORT = NO;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
};