Updated OpenCL (AMD/NVIDIA) and DX11 DirectCompute Visual Studio project files

CMake: minor fixes for project file distribution
Make resource loading more robust for DX11ClothDemo, and remove buttons that crash the demo
This commit is contained in:
erwin.coumans
2010-09-21 23:09:18 +00:00
parent cffb96c0c9
commit 0292521757
50 changed files with 5025 additions and 2602 deletions

View File

@@ -17,6 +17,7 @@ OPTION(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC Runtime Library DLL (/MD or /MDd)"
OPTION(USE_MSVC_INCREMENTAL_LINKING "Use MSVC Incremental Linking" OFF)
IF(MSVC)
IF (NOT USE_MSVC_INCREMENTAL_LINKING)
#MESSAGE("MSVC_INCREMENTAL_DEFAULT"+${MSVC_INCREMENTAL_DEFAULT})
@@ -109,10 +110,13 @@ SET(BulletClothExample_HDRS
INCLUDE_DIRECTORIES(
${DX11_INCLUDE_PATH}
${BULLET_PHYSICS_SOURCE_DIR}/src
"DXUT/Core" "DXUT/Optional"
"DXUT/Core"
"DXUT/Optional"
${VECTOR_MATH_INCLUDE}
)
LINK_DIRECTORIES(${DX11_LIB_PATH})
LINK_DIRECTORIES(
${DX11_LIB_PATH}
)
ADD_DEFINITIONS(-DUNICODE)
ADD_DEFINITIONS(-D_UNICODE)
@@ -134,10 +138,16 @@ TARGET_LINK_LIBRARIES(AppDX11ClothDemo
BulletCollision
LinearMath
BulletSoftBody
BulletSoftBodySolvers_CPU
BulletSoftBodySolvers_DX11
)
IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
SET_TARGET_PROPERTIES(AppDX11ClothDemo PROPERTIES DEBUG_POSTFIX "_Debug")
SET_TARGET_PROPERTIES(AppDX11ClothDemo PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel")
SET_TARGET_PROPERTIES(AppDX11ClothDemo PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
ENDIF()
IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
ADD_CUSTOM_COMMAND(
TARGET AppDX11ClothDemo