update project files to be more generic and hopefully compile anywhere

humamamouri · Aug 19, 2018 · bd0d387 · bd0d387
1 parent 5e3048b
commit bd0d387
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 15 deletions.
diff --git a/wrappers/matlab/librealsense_mex.sln b/wrappers/matlab/librealsense_mex.sln
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librealsense_mex", "librealsense_mex.vcxproj", "{C5DA93FC-DBBC-49FC-B138-F6B0476EC92C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C5DA93FC-DBBC-49FC-B138-F6B0476EC92C}.Debug|x64.ActiveCfg = Debug|x64
+		{C5DA93FC-DBBC-49FC-B138-F6B0476EC92C}.Debug|x64.Build.0 = Debug|x64
+		{C5DA93FC-DBBC-49FC-B138-F6B0476EC92C}.Debug|x86.ActiveCfg = Debug|Win32
+		{C5DA93FC-DBBC-49FC-B138-F6B0476EC92C}.Debug|x86.Build.0 = Debug|Win32
+		{C5DA93FC-DBBC-49FC-B138-F6B0476EC92C}.Release|x64.ActiveCfg = Release|x64
+		{C5DA93FC-DBBC-49FC-B138-F6B0476EC92C}.Release|x64.Build.0 = Release|x64
+		{C5DA93FC-DBBC-49FC-B138-F6B0476EC92C}.Release|x86.ActiveCfg = Release|Win32
+		{C5DA93FC-DBBC-49FC-B138-F6B0476EC92C}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/wrappers/matlab/librealsense_mex.vcxproj b/wrappers/matlab/librealsense_mex.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -28,7 +28,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -41,13 +41,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -90,11 +90,11 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>MATLAB_MEX_FILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Users\lramati\Documents\Code\librealsense\include;C:\MATLAB\R2017a\extern\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include\;C:\MATLAB\R2017b\extern\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>C:\MATLAB\R2017a\extern\lib\win64\microsoft;$(SolutionDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libmx.lib;libmex.lib;libmat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\MATLAB\R2017b\extern\lib\win64\microsoft;$(SolutionDir)..\..\build\third-party\realsense-file\$(Configuration);$(SolutionDir)..\..\build\$(Configuration);$(SolutionDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libmx.lib;libmex.lib;libmat.lib;realsense.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>librealsense_mex.def</ModuleDefinitionFile>
     </Link>
     <PreBuildEvent>
@@ -110,7 +110,14 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include\;C:\MATLAB\R2017b\extern\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
+    <Link>
+      <AdditionalDependencies>libmx.lib;libmex.lib;libmat.lib;realsense.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <ModuleDefinitionFile>librealsense_mex.def</ModuleDefinitionFile>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -120,6 +127,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include\;C:\MATLAB\R2017b\extern\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -135,14 +143,14 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>MATLAB_MEX_FILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Users\lramati\Documents\Code\librealsense\include;C:\MATLAB\R2017a\extern\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include\;C:\MATLAB\R2017b\extern\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>C:\MATLAB\R2017a\extern\lib\win64\microsoft;$(SolutionDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libmx.lib;libmex.lib;libmat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\MATLAB\R2017b\extern\lib\win64\microsoft;$(SolutionDir)..\..\build\third-party\realsense-file\$(Configuration);$(SolutionDir)..\..\build\$(Configuration);$(SolutionDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libmx.lib;libmex.lib;libmat.lib;realsense2.lib;realsense-file.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>librealsense_mex.def</ModuleDefinitionFile>
     </Link>
     <PreBuildEvent>
@@ -208,11 +216,6 @@
     <None Include="video_frame.m" />
     <None Include="video_stream_profile.m" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\build\realsense2.vcxproj">
-      <Project>{cbec6bd2-fee7-3420-be45-fa963045cd7b}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>