diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-10-31 15:54:21 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-10-31 15:54:21 -0400 |
| commit | 107e03ea13e0eba9c33f120f0d95ac9fefc7dcad (patch) | |
| tree | 00191b7ccb83fe436ad61bdbb43b523f431c6698 /objective-c/src | |
| parent | Update 3.7 changelog (diff) | |
| download | ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.tar.bz2 ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.tar.xz ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.zip | |
Replaced slice compiler options --ice, --underscore and --dll-export by
global metadata directives (ice-prefix, underscore, cpp:dll-export:SYMBOL and objc:dll-export:SYMBOL)
Added new cs:tie and java:tie metadata
Diffstat (limited to 'objective-c/src')
| -rw-r--r-- | objective-c/src/Glacier2/Makefile.mk | 2 | ||||
| -rw-r--r-- | objective-c/src/Ice/Makefile.mk | 2 | ||||
| -rw-r--r-- | objective-c/src/IceGrid/Makefile.mk | 2 | ||||
| -rw-r--r-- | objective-c/src/IceSSL/Makefile.mk | 2 | ||||
| -rw-r--r-- | objective-c/src/IceStorm/Makefile.mk | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/objective-c/src/Glacier2/Makefile.mk b/objective-c/src/Glacier2/Makefile.mk index 9ea974aee73..1d28a2536c8 100644 --- a/objective-c/src/Glacier2/Makefile.mk +++ b/objective-c/src/Glacier2/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries = Glacier2ObjC Glacier2ObjC_targetdir := $(libdir) -Glacier2ObjC_sliceflags := --include-dir objc/Glacier2 --dll-export GLACIER2_API +Glacier2ObjC_sliceflags := --include-dir objc/Glacier2 Glacier2ObjC_dependencies := IceObjC Glacier2ObjC_slicedir := $(slicedir)/Glacier2 Glacier2ObjC_includedir := $(includedir)/objc/Glacier2 diff --git a/objective-c/src/Ice/Makefile.mk b/objective-c/src/Ice/Makefile.mk index f0ffd62d000..d47e61d6d16 100644 --- a/objective-c/src/Ice/Makefile.mk +++ b/objective-c/src/Ice/Makefile.mk @@ -11,7 +11,7 @@ $(project)_libraries = IceObjC IceObjC_targetdir := $(libdir) IceObjC_cppflags := -DICE_API_EXPORTS -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated -IceObjC_sliceflags := --include-dir objc/Ice --dll-export ICE_API +IceObjC_sliceflags := --include-dir objc/Ice IceObjC_dependencies := Ice IceObjC_slicedir := $(slicedir)/Ice IceObjC_includedir := $(includedir)/objc/Ice diff --git a/objective-c/src/IceGrid/Makefile.mk b/objective-c/src/IceGrid/Makefile.mk index 954d1e55c85..3c631ddc9f7 100644 --- a/objective-c/src/IceGrid/Makefile.mk +++ b/objective-c/src/IceGrid/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries = IceGridObjC IceGridObjC_targetdir := $(libdir) -IceGridObjC_sliceflags := --include-dir objc/IceGrid --dll-export ICEGRID_API +IceGridObjC_sliceflags := --include-dir objc/IceGrid IceGridObjC_dependencies := IceObjC Glacier2ObjC IceGridObjC_slicedir := $(slicedir)/IceGrid IceGridObjC_includedir := $(includedir)/objc/IceGrid diff --git a/objective-c/src/IceSSL/Makefile.mk b/objective-c/src/IceSSL/Makefile.mk index 12af2cd6b96..76bf3841719 100644 --- a/objective-c/src/IceSSL/Makefile.mk +++ b/objective-c/src/IceSSL/Makefile.mk @@ -11,7 +11,7 @@ $(project)_libraries = IceSSLObjC IceSSLObjC_targetdir := $(libdir) IceSSLObjC_cppflags := -DICESSL_API_EXPORTS -Isrc/Ice -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated -IceSSLObjC_sliceflags := --include-dir objc/IceSSL --dll-export ICESSL_API +IceSSLObjC_sliceflags := --include-dir objc/IceSSL IceSSLObjC_dependencies := IceObjC IceSSL Ice IceSSLObjC_slicedir := $(slicedir)/IceSSL IceSSLObjC_includedir := $(includedir)/objc/IceSSL diff --git a/objective-c/src/IceStorm/Makefile.mk b/objective-c/src/IceStorm/Makefile.mk index 12299b76a6b..cb2a622332f 100644 --- a/objective-c/src/IceStorm/Makefile.mk +++ b/objective-c/src/IceStorm/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries = IceStormObjC IceStormObjC_targetdir := $(libdir) -IceStormObjC_sliceflags := --include-dir objc/IceStorm --dll-export ICESTORM_API +IceStormObjC_sliceflags := --include-dir objc/IceStorm IceStormObjC_dependencies := IceObjC IceStormObjC_slicedir := $(slicedir)/IceStorm IceStormObjC_includedir := $(includedir)/objc/IceStorm |