diff options
| author | Jose <jose@zeroc.com> | 2017-10-16 21:24:16 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-10-16 21:24:16 +0200 |
| commit | 270ce90ff96961d138f7380cc204d27cb41f9a4c (patch) | |
| tree | 7d39efe7d2c758fe4cf1e22b8ec167d4e81e33cc | |
| parent | Fix bogus ObjectPrx unref implementation (diff) | |
| download | ice-270ce90ff96961d138f7380cc204d27cb41f9a4c.tar.bz2 ice-270ce90ff96961d138f7380cc204d27cb41f9a4c.tar.xz ice-270ce90ff96961d138f7380cc204d27cb41f9a4c.zip | |
Register plug-ins with MATLAB extension
| -rw-r--r-- | matlab/src/Init.cpp | 19 | ||||
| -rw-r--r-- | matlab/src/msbuild/ice/ice.vcxproj | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/matlab/src/Init.cpp b/matlab/src/Init.cpp index 9a61f77e7af..cb6d38c80a9 100644 --- a/matlab/src/Init.cpp +++ b/matlab/src/Init.cpp @@ -16,6 +16,25 @@ using namespace std; using namespace IceMatlab; +namespace +{ + +class Init +{ +public: + + Init() + { + Ice::registerIceWS(true); + Ice::registerIceSSL(false); + Ice::registerIceDiscovery(false); + Ice::registerIceLocatorDiscovery(false); + } +}; + +Init init; +} + extern "C" { diff --git a/matlab/src/msbuild/ice/ice.vcxproj b/matlab/src/msbuild/ice/ice.vcxproj index ab8325b5aa1..757ac713fd6 100644 --- a/matlab/src/msbuild/ice/ice.vcxproj +++ b/matlab/src/msbuild/ice/ice.vcxproj @@ -14,6 +14,7 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{89C40F1A-1761-46C1-B326-5B20BE6F8173}</ProjectGuid> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <IceLanguageMapping>matlab</IceLanguageMapping> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |