summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-05-20 16:36:27 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-05-20 16:36:27 +0200
commit781467a41a3a472e0d5cafb08fd6fb185e9deffb (patch)
tree509a0bdd73858482af8d19e0b2aedfd8e2094e5f /cpp/src
parentSupport for project extensions (diff)
downloadice-781467a41a3a472e0d5cafb08fd6fb185e9deffb.tar.bz2
ice-781467a41a3a472e0d5cafb08fd6fb185e9deffb.tar.xz
ice-781467a41a3a472e0d5cafb08fd6fb185e9deffb.zip
Install slice link for /usr installs, fixed for Objective-C ARC config
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Makefile.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk
index 99f6bbabb8f..f37b987a708 100644
--- a/cpp/src/Ice/Makefile.mk
+++ b/cpp/src/Ice/Makefile.mk
@@ -26,4 +26,9 @@ Ice_system_libs := $(ICE_OS_LIBS)
Ice_extra_sources := $(wildcard src/IceUtil/*.cpp)
Ice_excludes := $(currentdir)/DLLMain.cpp
+Ice_extra_sources[iphoneos] := $(wildcard $(addprefix $(currentdir)/ios/,*.cpp *.mm))
+#Ice_excludes[iphoneos] := $(wildcard $(addprefix $(currentdir)/RegistryPlugins.cpp))
+Ice_extra_sources[iphonesimulator] := $(wildcard $(addprefix $(currentdir)/ios/,*.cpp *.mm))
+#Ice_excludes[iphonesimulator] := $(wildcard $(addprefix $(currentdir)/RegistryPlugins.cpp))
+
projects += $(project)