Make is easier to compile Bullet/Extras/sph:
1) use $(CUDA_INC_PATH) for CUDA include path 2) avoid using cuda util, but use BT_GPU_SAFE_CALL and BT_GPU_CHECK_ERROR (defined in Bullet/Extras/CUDA/btCudaUtil.h) 3) remove pre-linked glee*.lib, but include glee.c directly
This commit is contained in:
@@ -40,7 +40,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="fluids;common;marching;marching_tris;C:\CUDA\common\inc"
|
||||
AdditionalIncludeDirectories="fluids;common;marching;marching_tris;"$(CUDA_INC_PATH)""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
@@ -61,7 +61,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="glee_2005.lib cudart.lib cutil32D.lib"
|
||||
AdditionalDependencies="cudart.lib"
|
||||
LinkIncremental="2"
|
||||
IgnoreDefaultLibraryNames="libcmt.lib"
|
||||
GenerateDebugInformation="true"
|
||||
@@ -137,7 +137,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="cudart.lib cutil32.lib"
|
||||
AdditionalDependencies="cudart.lib "
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="C:\CUDA\common\lib;."
|
||||
IgnoreDefaultLibraryNames="libcmtd.lib"
|
||||
@@ -215,7 +215,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="glee_VS2005.lib cg.lib cgGL.lib cudart.lib cutil32D.lib"
|
||||
AdditionalDependencies="cg.lib cgGL.lib cudart.lib "
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(OutDir)/fluids_2005.pdb"
|
||||
|
||||
Reference in New Issue
Block a user