Merge pull request #2680 from ev-mp/matlab_build_fix

Fix Matlab wrapper search path

wrappers/matlab/librealsense_mex.vcxproj

@@ -70,19 +70,19 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetExt>.mexw64</TargetExt>
-    <OutDir>$(SolutionDir)$(Configuration)\+realsense\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\+realsense\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetExt>.mexw64</TargetExt>
-    <OutDir>$(SolutionDir)$(Configuration)\+realsense\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\+realsense\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetExt>.mexw64</TargetExt>
-    <OutDir>$(SolutionDir)$(Configuration)\+realsense\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\+realsense\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetExt>.mexw64</TargetExt>
-    <OutDir>$(SolutionDir)$(Configuration)\+realsense\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\+realsense\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -95,7 +95,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>C:\MATLAB\R2017a\extern\lib\win64\microsoft;C:\MATLAB\R2017b\extern\lib\win64\microsoft;$(OutDir)..\..\third-party\libtm\libtm\src\$(Configuration);$(OutDir)..\..\third-party\realsense-file\$(Configuration);$(OutDir)..\..\libusb_install\lib;$(OutDir)..;$(ProjectDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\MATLAB\R2017a\extern\lib\win64\microsoft;C:\MATLAB\R2017b\extern\lib\win64\microsoft;$(ProjectDir)..\..\build\$(Configuration);$(ProjectDir)..\..\build\third-party\libtm\libtm\src\$(Configuration);$(ProjectDir)..\..\build\third-party\realsense-file\$(Configuration);$(ProjectDir)..\..\build\libusb_install\lib;$(OutDir)..;$(ProjectDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libmx.lib;libmex.lib;libmat.lib;realsense2.lib;realsense-file.lib;tm.lib;usb.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>librealsense_mex.def</ModuleDefinitionFile>
     </Link>
@@ -155,9 +155,10 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>C:\MATLAB\R2017a\extern\lib\win64\microsoft;C:\MATLAB\R2017b\extern\lib\win64\microsoft;$(OutDir)..\..\third-party\libtm\libtm\src\$(Configuration);$(OutDir)..\..\third-party\realsense-file\$(Configuration);$(OutDir)..\..\libusb_install\lib;$(OutDir)..;$(ProjectDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\MATLAB\R2017a\extern\lib\win64\microsoft;C:\MATLAB\R2017b\extern\lib\win64\microsoft;$(ProjectDir)..\..\build\$(Configuration);$(ProjectDir)..\..\build\third-party\libtm\libtm\src\$(Configuration);$(ProjectDir)..\..\build\third-party\realsense-file\$(Configuration);$(ProjectDir)..\..\build\libusb_install\lib;$(OutDir)..;$(ProjectDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libmx.lib;libmex.lib;libmat.lib;realsense2.lib;realsense-file.lib;tm.lib;usb.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>librealsense_mex.def</ModuleDefinitionFile>
+      <IgnoreSpecificDefaultLibraries>libcmtd</IgnoreSpecificDefaultLibraries>
     </Link>
     <PreBuildEvent>
       <Command>xcopy /y $(ProjectDir)*.m $(OutDir)</Command>