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 /cpp/src/IceSSL | |
| 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 'cpp/src/IceSSL')
| -rw-r--r-- | cpp/src/IceSSL/Makefile.mk | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj | 5 | ||||
| -rw-r--r-- | cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk index 0e2e3d00e94..75a4535439a 100644 --- a/cpp/src/IceSSL/Makefile.mk +++ b/cpp/src/IceSSL/Makefile.mk @@ -12,6 +12,6 @@ $(project)_libraries := IceSSL IceSSL_targetdir := $(libdir) IceSSL_dependencies := Ice IceSSL_cppflags := -DICE_SSL_API_EXPORTS -IceSSL_sliceflags := --include-dir IceSSL --dll-export ICE_SSL_API +IceSSL_sliceflags := --include-dir IceSSL projects += $(project) diff --git a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj index 046de28a09a..78f8038fd5a 100644 --- a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -68,7 +68,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_SSL_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -225,4 +224,4 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj index 4826c43666e..fb6ffc509d0 100644 --- a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj +++ b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -73,7 +73,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_SSL_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -230,4 +229,4 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> |