2 files changed, 13 insertions, 7 deletions
diff --git a/NvCloth/compiler/cmake/windows/CMakeLists.txt b/NvCloth/compiler/cmake/windows/CMakeLists.txt
index 30f2a65..64630bf 100644
--- a/NvCloth/compiler/cmake/windows/CMakeLists.txt
+++ b/NvCloth/compiler/cmake/windows/CMakeLists.txt
@@ -25,7 +25,7 @@ SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE " /LTCG")
 SET(CMAKE_SHARED_LINKER_FLAGS_PROFILE " /LTCG")
 SET(CMAKE_SHARED_LINKER_FLAGS_CHECKED " /LTCG")
 
-IF(DEFINED STATIC_WINCRT)
+IF(STATIC_WINCRT)
     SET(WINCRT_NDEBUG "/MT")
     SET(WINCRT_DEBUG "/MTd")
 ELSE()
diff --git a/NvCloth/compiler/cmake/windows/NvCloth.cmake b/NvCloth/compiler/cmake/windows/NvCloth.cmake
index 065ea18..7641d1a 100644
--- a/NvCloth/compiler/cmake/windows/NvCloth.cmake
+++ b/NvCloth/compiler/cmake/windows/NvCloth.cmake
@@ -78,10 +78,6 @@ LIST(APPEND NVCLOTH_PLATFORM_SOURCE_FILES
 	
 	${PROJECT_ROOT_DIR}/src/dx/DxSolverKernelBlob.h
 	${PROJECT_ROOT_DIR}/src/dx/DxSortKernel.inc
-	#${PROJECT_ROOT_DIR}/src/neon/NeonCollision.cpp
-	#${PROJECT_ROOT_DIR}/src/neon/NeonSelfCollision.cpp
-	#${PROJECT_ROOT_DIR}/src/neon/NeonSolverKernel.cpp
-	#${PROJECT_ROOT_DIR}/src/neon/SwCollisionHelpers.h
 )
 ENDIF()
 
@@ -134,9 +130,15 @@ DEPENDS ${CUDA_FATBIN}
 )
 ENDIF()
 
+IF(PX_STATIC_LIBRARIES)
+	SET(NVCLOTH_API_COMPILE_DEFS NV_CLOTH_IMPORT=;PX_CALL_CONV=;)
+ELSE()
+	SET(NVCLOTH_API_COMPILE_DEFS NV_CLOTH_IMPORT=PX_DLL_EXPORT;)
+ENDIF()
+
 SET(NVCLOTH_COMPILE_DEFS
 
-	NV_CLOTH_IMPORT=PX_DLL_EXPORT
+	${NVCLOTH_API_COMPILE_DEFS}
 
 	$<$<CONFIG:debug>:${NVCLOTH_WINDOWS_DEBUG_COMPILE_DEFS};PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;>
 	$<$<CONFIG:checked>:${NVCLOTH_WINDOWS_CHECKED_COMPILE_DEFS};PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;>
@@ -162,7 +164,11 @@ LIST(APPEND NVCLOTH_COMPILE_DEFS
 )
 ENDIF()
 
-SET(NVCLOTH_LIBTYPE SHARED)
+IF(PX_STATIC_LIBRARIES)
+	SET(NVCLOTH_LIBTYPE STATIC)
+ELSE()
+	SET(NVCLOTH_LIBTYPE SHARED)
+ENDIF()
 
 # include common NvCloth settings
 INCLUDE(../common/NvCloth.cmake)