summaryrefslogtreecommitdiff
path: root/ios/experimental
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-01-04 17:41:37 +0200
committerTor Lillqvist <tml@iki.fi>2013-01-06 16:00:52 +0200
commit617e5f8ac930d82129a14fb52df925cd0ff524ae (patch)
tree6700267099b874f9a2446f28436740bc10bf8cf3 /ios/experimental
parentb95d3caa95384d0fb00ac59f875869371cc70677 (diff)
Hack a bit more on the iOS app build mechanism
There was quite come confusion as to where Xcode wants the Run Script phase (= our gbuild mechanism) to put the executable. I think I got it right now. Xcode can be quite scary as soon as you do anything out of the ordinary. (But then, what isn't.) Change-Id: I22bbdfaef88174815bff66d6c7241f4ba2360246
Diffstat (limited to 'ios/experimental')
-rw-r--r--ios/experimental/Viewer/.gitignore2
-rw-r--r--ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj4
-rw-r--r--ios/experimental/Viewer/Viewer/Icon-72.pngbin1358 -> 1247 bytes
3 files changed, 3 insertions, 3 deletions
diff --git a/ios/experimental/Viewer/.gitignore b/ios/experimental/Viewer/.gitignore
index 44ac7a8d84fa..e76e0edcf6aa 100644
--- a/ios/experimental/Viewer/.gitignore
+++ b/ios/experimental/Viewer/.gitignore
@@ -1,4 +1,4 @@
.DS_Store
-DerivedData
+build
Viewer.xcodeproj/project.xcworkspace
Viewer.xcodeproj/xcuserdata
diff --git a/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj b/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj
index 5e65aae892bb..4fad8f0a8a7d 100644
--- a/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj
+++ b/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj
@@ -187,11 +187,11 @@
inputPaths = (
);
outputPaths = (
- "$(DERIVED_FILE_DIR)/Viewer.app",
+ "$(CONFIGURATION_BUILD_DIR)/$(EXECUTABLE_PATH)",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "cd ../.. && /opt/lo/bin/make";
+ shellScript = "cd ../.. && /opt/lo/bin/make -r";
};
/* End PBXShellScriptBuildPhase section */
diff --git a/ios/experimental/Viewer/Viewer/Icon-72.png b/ios/experimental/Viewer/Viewer/Icon-72.png
index e5a34fd23daf..8a355c2be915 100644
--- a/ios/experimental/Viewer/Viewer/Icon-72.png
+++ b/ios/experimental/Viewer/Viewer/Icon-72.png
Binary files differ