summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--matlab/src/Init.cpp19
-rw-r--r--matlab/src/msbuild/ice/ice.vcxproj1
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">