Skip to content
Snippets Groups Projects
Commit 68d8f62e authored by Mark Winter's avatar Mark Winter
Browse files

Removed module definition for CudaMex (now uses __declspec(dllexport) linkage)

parent 32d0744c
No related branches found
No related tags found
No related merge requests found
...@@ -61,7 +61,8 @@ ...@@ -61,7 +61,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(MATLAB_DIR)\extern\lib\win64\microsoft;$(SolutionDir)Output\CudaImageProcessor\$(Configuration)_$(PlatformName)\</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(MATLAB_DIR)\extern\lib\win64\microsoft;$(SolutionDir)Output\CudaImageProcessor\$(Configuration)_$(PlatformName)\</AdditionalLibraryDirectories>
<AdditionalDependencies>CudaImageProcessor_d.lib;libmx.lib;libmex.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CudaImageProcessor_d.lib;libmx.lib;libmex.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>$(SolutionDir)Mex\CudaMex.def</ModuleDefinitionFile> <ModuleDefinitionFile>
</ModuleDefinitionFile>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>echo copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64" <Command>echo copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64"
...@@ -85,7 +86,8 @@ copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64"</Command> ...@@ -85,7 +86,8 @@ copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64"</Command>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(MATLAB_DIR)\extern\lib\win64\microsoft;$(SolutionDir)Output\CudaImageProcessor\$(Configuration)_$(PlatformName)\</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(MATLAB_DIR)\extern\lib\win64\microsoft;$(SolutionDir)Output\CudaImageProcessor\$(Configuration)_$(PlatformName)\</AdditionalLibraryDirectories>
<AdditionalDependencies>CudaImageProcessor.lib;libmx.lib;libmex.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CudaImageProcessor.lib;libmx.lib;libmex.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>$(SolutionDir)Mex\CudaMex.def</ModuleDefinitionFile> <ModuleDefinitionFile>
</ModuleDefinitionFile>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>echo copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64" <Command>echo copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64"
...@@ -130,9 +132,6 @@ copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64"</Command> ...@@ -130,9 +132,6 @@ copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64"</Command>
<ClCompile Include="Mex\MexWienerFilter.cpp" /> <ClCompile Include="Mex\MexWienerFilter.cpp" />
<None Include="Mex\_TemplateMex.cpp" /> <None Include="Mex\_TemplateMex.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Mex\CudaMex.def" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
......
...@@ -118,9 +118,6 @@ ...@@ -118,9 +118,6 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Mex\CudaMex.def">
<Filter>Resource Files</Filter>
</None>
<None Include="Mex\_TemplateMex.cpp"> <None Include="Mex\_TemplateMex.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
......
LIBRARY "CudaMex"
EXPORTS DllMain
EXPORTS mexFunction
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment