summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-12-02 14:53:36 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-12-02 14:53:36 +0100
commit6d57f7874713e6632c2e49590538c6a48ddcc311 (patch)
tree6baf1ac308922b42f21c3f00424fd3e1a5fb3269
parentdcfd15335549fa8e3e56260791cc4510331f7be6 (diff)
downloadastra-6d57f7874713e6632c2e49590538c6a48ddcc311.tar.gz
astra-6d57f7874713e6632c2e49590538c6a48ddcc311.tar.bz2
astra-6d57f7874713e6632c2e49590538c6a48ddcc311.tar.xz
astra-6d57f7874713e6632c2e49590538c6a48ddcc311.zip
Fix Windows builds of astra_mex_direct
-rw-r--r--build/msvc/gen.py4
-rw-r--r--matlab/mex/astra_mex_direct_vc09.vcproj16
-rw-r--r--matlab/mex/astra_mex_direct_vc11.vcxproj4
3 files changed, 24 insertions, 0 deletions
diff --git a/build/msvc/gen.py b/build/msvc/gen.py
index a9bc494..72d4582 100644
--- a/build/msvc/gen.py
+++ b/build/msvc/gen.py
@@ -103,6 +103,10 @@ P8["files"] = [
"astra_mex_direct_c.cpp",
"mexHelpFunctions.cpp",
"mexHelpFunctions.h",
+"mexCopyDataHelpFunctions.cpp",
+"mexCopyDataHelpFunctions.h",
+"mexDataManagerHelpFunctions.cpp",
+"mexDataManagerHelpFunctions.h",
"mexInitFunctions.cpp",
"mexInitFunctions.h",
]
diff --git a/matlab/mex/astra_mex_direct_vc09.vcproj b/matlab/mex/astra_mex_direct_vc09.vcproj
index 04b49ac..5d27c65 100644
--- a/matlab/mex/astra_mex_direct_vc09.vcproj
+++ b/matlab/mex/astra_mex_direct_vc09.vcproj
@@ -599,6 +599,22 @@
>
</File>
<File
+ RelativePath=".\mexCopyDataHelpFunctions.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\mexCopyDataHelpFunctions.h"
+ >
+ </File>
+ <File
+ RelativePath=".\mexDataManagerHelpFunctions.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\mexDataManagerHelpFunctions.h"
+ >
+ </File>
+ <File
RelativePath=".\mexInitFunctions.cpp"
>
</File>
diff --git a/matlab/mex/astra_mex_direct_vc11.vcxproj b/matlab/mex/astra_mex_direct_vc11.vcxproj
index 15c3c06..bc2db62 100644
--- a/matlab/mex/astra_mex_direct_vc11.vcxproj
+++ b/matlab/mex/astra_mex_direct_vc11.vcxproj
@@ -294,10 +294,14 @@
<ItemGroup>
<ClCompile Include="astra_mex_direct_c.cpp" />
<ClCompile Include="mexHelpFunctions.cpp" />
+ <ClCompile Include="mexCopyDataHelpFunctions.cpp" />
+ <ClCompile Include="mexDataManagerHelpFunctions.cpp" />
<ClCompile Include="mexInitFunctions.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="mexHelpFunctions.h" />
+ <ClInclude Include="mexCopyDataHelpFunctions.h" />
+ <ClInclude Include="mexDataManagerHelpFunctions.h" />
<ClInclude Include="mexInitFunctions.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />