diff options
| author | Marijn Tamis <[email protected]> | 2018-09-12 14:12:47 +0200 |
|---|---|---|
| committer | Marijn Tamis <[email protected]> | 2018-09-12 14:12:47 +0200 |
| commit | 7bceea80d4a04649f495f4f4331d7e3bdcdb05ca (patch) | |
| tree | 824767cccf7b516a8c0b32467c6314eaa802f58d /NvCloth/samples/compiler | |
| parent | Added missing GenerateProjectsIOS.sh file (diff) | |
| download | nvcloth-7bceea80d4a04649f495f4f4331d7e3bdcdb05ca.tar.xz nvcloth-7bceea80d4a04649f495f4f4331d7e3bdcdb05ca.zip | |
1.1.5 Release (24934621)
Diffstat (limited to 'NvCloth/samples/compiler')
| -rw-r--r-- | NvCloth/samples/compiler/cmake/SampleBase.cmake | 9 | ||||
| -rw-r--r-- | NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake | 5 | ||||
| -rw-r--r-- | NvCloth/samples/compiler/cmake/windows/SampleBase.cmake | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/NvCloth/samples/compiler/cmake/SampleBase.cmake b/NvCloth/samples/compiler/cmake/SampleBase.cmake index 656074f..b552bb7 100644 --- a/NvCloth/samples/compiler/cmake/SampleBase.cmake +++ b/NvCloth/samples/compiler/cmake/SampleBase.cmake @@ -66,10 +66,8 @@ SET(RENDERER_FILES ${SB_RENDERER_SOURCE_DIR}/ShaderUtils.h ${SB_RENDERER_SOURCE_DIR}/SkinnedRenderMesh.cpp ${SB_RENDERER_SOURCE_DIR}/SkinnedRenderMesh.h - ${SB_RENDERER_SOURCE_DIR}/WeightedSkinRenderMesh.cpp - ${SB_RENDERER_SOURCE_DIR}/WeightedSkinRenderMesh.h - ${SB_RENDERER_SOURCE_DIR}/Model.cpp - ${SB_RENDERER_SOURCE_DIR}/Model.h + + ) SET(SCENE_FILES @@ -154,8 +152,7 @@ SET(UTIL_FILES ${SB_UTILS_SOURCE_DIR}/MeshGenerator.h ${SB_UTILS_SOURCE_DIR}/DataStream.cpp ${SB_UTILS_SOURCE_DIR}/DataStream.h - ${SB_UTILS_SOURCE_DIR}/AnimatedModelUtilities.cpp - ${SB_UTILS_SOURCE_DIR}/AnimatedModelUtilities.h + ) SET(TASK_FILES diff --git a/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake b/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake index ec59323..0673b96 100644 --- a/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake +++ b/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake @@ -16,10 +16,5 @@ ADD_CUSTOM_COMMAND(TARGET SampleBase POST_BUILD ${D3DCOMPILER_DLL} ${BL_EXE_OUTPUT_DIR} ) -ADD_CUSTOM_COMMAND(TARGET SampleBase POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${ASSIMP_DLLS} - ${BL_EXE_OUTPUT_DIR} -) MESSAGE("Windows/SampleBase.cmake [end]")
\ No newline at end of file diff --git a/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake b/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake index 0d5e040..46b865a 100644 --- a/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake +++ b/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake @@ -35,7 +35,6 @@ if (CMAKE_CL_64) SET(D3DCOMPILER_DLL "\"$(VC_ExecutablePath_x64_x64)/d3dcompiler_47.dll\"") - SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll) else() SET(SHADOW_LIB ${NVCLOTH_ROOT_DIR}/samples/external/shadow_lib/GFSDK_ShadowLib_DX11.win32.lib) SET(SHADOW_DLLS ${NVCLOTH_ROOT_DIR}/samples/external/shadow_lib/GFSDK_ShadowLib_DX11.win32.dll) @@ -45,7 +44,6 @@ else() SET(D3DCOMPILER_DLL "\"$(VC_ExecutablePath_x86_x86)/d3dcompiler_47.dll\"") - SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll) endif() |