summaryrefslogtreecommitdiff
path: root/objective-c/test
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-08-30 15:18:31 +0200
committerBenoit Foucher <benoit@zeroc.com>2019-08-30 15:18:31 +0200
commit15fa108a1e20ab360f0344d92c0dc9c52b8cd9f0 (patch)
tree19d42e0e408c6d1d2b369e7e69c3fb91c0d56d04 /objective-c/test
parentFixed IceBox exception handling, fixes #486 (diff)
downloadice-15fa108a1e20ab360f0344d92c0dc9c52b8cd9f0.tar.bz2
ice-15fa108a1e20ab360f0344d92c0dc9c52b8cd9f0.tar.xz
ice-15fa108a1e20ab360f0344d92c0dc9c52b8cd9f0.zip
Fixed Slice code generation with Xcode projects
Diffstat (limited to 'objective-c/test')
-rw-r--r--objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj28
1 files changed, 23 insertions, 5 deletions
diff --git a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj
index 2fde2bdf095..c54703d5f67 100644
--- a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj
+++ b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 48;
+ objectVersion = 52;
objects = {
/* Begin PBXBuildFile section */
@@ -365,11 +365,14 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.ice";
fileType = pattern.proxy;
+ inputFiles = (
+ );
isEditable = 1;
outputFiles = (
"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).m",
"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h",
);
+ runOncePerArchitecture = 0;
script = "#export ICE_BIN_DIST=all\n../../../../scripts/ice-builder-xcode-wrapper\n";
};
14B7DF791E043085001D0109 /* PBXBuildRule */ = {
@@ -377,11 +380,14 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.ice";
fileType = pattern.proxy;
+ inputFiles = (
+ );
isEditable = 1;
outputFiles = (
"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).m",
"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h",
);
+ runOncePerArchitecture = 0;
script = "#export ICE_BIN_DIST=all\n../../../../scripts/ice-builder-xcode-wrapper\n";
};
/* End PBXBuildRule section */
@@ -1770,7 +1776,10 @@
);
INFOPLIST_FILE = Classes/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
OTHER_LDFLAGS = (
"-lIceGridObjC",
@@ -1810,7 +1819,10 @@
);
INFOPLIST_FILE = Classes/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
OTHER_LDFLAGS = (
"-lIceGridObjC",
@@ -1848,7 +1860,10 @@
);
INFOPLIST_FILE = Classes/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
OTHER_CFLAGS = "-fobjc-arc-exceptions ";
OTHER_LDFLAGS = (
@@ -1887,7 +1902,10 @@
);
INFOPLIST_FILE = Classes/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
OTHER_CFLAGS = "-fobjc-arc-exceptions ";
OTHER_LDFLAGS = (