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:
@@ -125,7 +125,7 @@
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="fluids;common;marching;sphere_scan;marching_tris"
|
||||
AdditionalIncludeDirectories="fluids;common;marching;sphere_scan;marching_tris;"$(CUDA_INC_PATH)";../../Glut"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="0"
|
||||
@@ -146,9 +146,9 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="glee_2008.lib"
|
||||
OutputFile="$(OutDir)/fluids.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="../../Glut"
|
||||
IgnoreDefaultLibraryNames="libcmtd.lib"
|
||||
GenerateDebugInformation="false"
|
||||
SubSystem="1"
|
||||
@@ -292,6 +292,10 @@
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath=".\common\GLee.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\main.cpp"
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user