summaryrefslogtreecommitdiffstats
path: root/astra_vc11.vcxproj
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-02-26 11:51:50 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-02-26 11:51:50 +0100
commitd2407fea1ed7c3c718a4c115d8c632664c2378dd (patch)
tree9f0d21c77d64da4e9be1f4b0ba99f54edc691ad5 /astra_vc11.vcxproj
parent3cae1d138c53a3fd042de3d2c9d9a07cf0650e0f (diff)
parent0ca00f4c671d6d583ae77838d3e0d4fcd411f077 (diff)
downloadastra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.gz
astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.bz2
astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.xz
astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.zip
Merge branch 'master' into python-interface
Diffstat (limited to 'astra_vc11.vcxproj')
-rw-r--r--astra_vc11.vcxproj4
1 files changed, 2 insertions, 2 deletions
diff --git a/astra_vc11.vcxproj b/astra_vc11.vcxproj
index 1288d35..482bb1b 100644
--- a/astra_vc11.vcxproj
+++ b/astra_vc11.vcxproj
@@ -194,7 +194,7 @@
<OptimizeReferences>true</OptimizeReferences>
<OutputFile>bin\x64\Release_CUDA\AstraCuda64.dll</OutputFile>
<AdditionalLibraryDirectories>lib\x64;$(CUDA_LIB_PATH);$(NVSDKCUDA_ROOT)\common\lib;$(NVSDKCOMPUTE_ROOT)/C/common/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>cudart.lib;FreeImage.lib;cufft.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>cudart.lib;cufft.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
</Link>
<CudaCompile>
@@ -436,4 +436,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 5.5.targets" />
</ImportGroup>
-</Project>
+</Project> \ No newline at end of file