Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
hydra-image-processor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenSource
hydra-image-processor
Commits
68d8f62e
Commit
68d8f62e
authored
6 years ago
by
Mark Winter
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/c/CudaMex.vcxproj
+4
-5
4 additions, 5 deletions
src/c/CudaMex.vcxproj
src/c/CudaMex.vcxproj.filters
+0
-3
0 additions, 3 deletions
src/c/CudaMex.vcxproj.filters
src/c/Mex/CudaMex.def
+0
-3
0 additions, 3 deletions
src/c/Mex/CudaMex.def
with
4 additions
and
11 deletions
src/c/CudaMex.vcxproj
+
4
−
5
View file @
68d8f62e
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
src/c/CudaMex.vcxproj.filters
+
0
−
3
View file @
68d8f62e
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
src/c/Mex/CudaMex.def
deleted
100644 → 0
+
0
−
3
View file @
32d0744c
LIBRARY "CudaMex"
EXPORTS DllMain
EXPORTS mexFunction
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment