12 files changed, 45 insertions, 69 deletions
diff --git a/NvCloth/compiler/cmake/android/CMakeLists.txt b/NvCloth/compiler/cmake/android/CMakeLists.txt
index 61a6892..7ef0673 100644
--- a/NvCloth/compiler/cmake/android/CMakeLists.txt
+++ b/NvCloth/compiler/cmake/android/CMakeLists.txt
@@ -44,19 +44,7 @@ SET(NVCLOTH_ANDROID_RELEASE_COMPILE_DEFS NDEBUG)
 SET(PX_SELECT_COMPONENTS PxFoundation)
 FIND_PACKAGE(PxShared REQUIRED)
 
-################################################################################
-# TODO
-################################################################################
-# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment
-#  such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it.
-
-# Add PxShared as a dependency so that we can use project references
-#ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/android "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin")
-################################################################################
-
 # Include all of the projects
 INCLUDE(NvCloth.cmake)
 
-TARGET_LINK_LIBRARIES(NvCloth PUBLIC PxFoundation)
-
 MESSAGE("[NvCloth]cmake/android/CMakeList.txt END")
 \ No newline at end of file
diff --git a/NvCloth/compiler/cmake/android/NvCloth.cmake b/NvCloth/compiler/cmake/android/NvCloth.cmake
index 544a3b5..8463368 100644
--- a/NvCloth/compiler/cmake/android/NvCloth.cmake
+++ b/NvCloth/compiler/cmake/android/NvCloth.cmake
@@ -7,6 +7,11 @@ SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT})
 SET(NVCLOTH_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../../../)
 
 SET(NVCLOTH_PLATFORM_SOURCE_FILES
+	${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixAtomic.cpp
+	${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixFPU.h
+	${PROJECT_ROOT_DIR}/src/ps/android/cpu-features.c
+	${PROJECT_ROOT_DIR}/src/ps/android/cpu-features.h
+
 	${PROJECT_ROOT_DIR}/src/neon/NeonCollision.cpp
 	${PROJECT_ROOT_DIR}/src/neon/NeonSelfCollision.cpp
 	${PROJECT_ROOT_DIR}/src/neon/NeonSolverKernel.cpp
diff --git a/NvCloth/compiler/cmake/common/CMakeLists.txt b/NvCloth/compiler/cmake/common/CMakeLists.txt
index eddb1d9..bbebc3f 100644
--- a/NvCloth/compiler/cmake/common/CMakeLists.txt
+++ b/NvCloth/compiler/cmake/common/CMakeLists.txt
@@ -8,18 +8,10 @@ CMAKE_POLICY(SET CMP0057 NEW) # Enable IN_LIST
 
 SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT})
 
-SET(CMAKE_MODULE_PATH $ENV{GW_DEPS_ROOT}/sw/physx/tools/CMakeModules)
-
-IF(EXISTS $ENV{GW_DEPS_ROOT}/Externals/CMakeModules)
-	SET(CMAKE_MODULE_PATH $ENV{GW_DEPS_ROOT}/Externals/CMakeModules)
-ENDIF()
+SET(CMAKE_MODULE_PATH $ENV{GW_DEPS_ROOT}/NvCloth/Externals/CMakeModules)
 
 MESSAGE( "[NvCloth]cmake/common CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")
 
-IF(EXISTS $ENV{GW_DEPS_ROOT}/Externals/CMakeModules)
-	SET(CMAKE_MODULE_PATH $ENV{GW_DEPS_ROOT}/Externals/CMakeModules)
-ENDIF()
-
 # Add find modules to the path
 IF(NOT EXISTS ${CMAKE_MODULE_PATH})
 	MESSAGE(FATAL_ERROR "Could not find CMakeModules at ${CMAKE_MODULE_PATH}")
diff --git a/NvCloth/compiler/cmake/common/NvCloth.cmake b/NvCloth/compiler/cmake/common/NvCloth.cmake
index 94b7e79..8d59261 100644
--- a/NvCloth/compiler/cmake/common/NvCloth.cmake
+++ b/NvCloth/compiler/cmake/common/NvCloth.cmake
@@ -20,6 +20,21 @@ SET( NV_CLOTH_SOURCE_LIST
 	${PROJECT_ROOT_DIR}/include/NvCloth/Range.h
 	${PROJECT_ROOT_DIR}/include/NvCloth/Solver.h
 	
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/Ps.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsAtomic.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsAlignedMalloc.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsAllocator.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsAllocator.cpp
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsArray.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsBasicTemplates.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsBitUtils.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsHash.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsHashInternals.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsHashMap.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsIntrinsics.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsUserAllocated.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/PsMathUtils.h
+	
 	${PROJECT_ROOT_DIR}/src/Allocator.cpp
 	${PROJECT_ROOT_DIR}/src/BoundingBox.h
 	${PROJECT_ROOT_DIR}/src/Callbacks.cpp
@@ -119,6 +134,13 @@ SET( NV_CLOTH_SOURCE_LIST
 	${PROJECT_ROOT_DIR}/src/sse2/SwCollisionHelpers.h
 	${PROJECT_ROOT_DIR}/src/sse2/SwSolveConstraints.h
 	
+	${PROJECT_ROOT_DIR}/src/ps/PsAlloca.h
+	${PROJECT_ROOT_DIR}/src/ps/PsFPU.h
+	${PROJECT_ROOT_DIR}/src/ps/PsSort.h
+	${PROJECT_ROOT_DIR}/src/ps/PsSortInternals.h
+	${PROJECT_ROOT_DIR}/src/ps/PsUtilities.h
+	${PROJECT_ROOT_DIR}/src/ps/PxIntrinsics.h
+	
 	${PROJECT_ROOT_DIR}/extensions/include/NvClothExt/ClothFabricCooker.h
 	${PROJECT_ROOT_DIR}/extensions/include/NvClothExt/ClothMeshDesc.h
 	${PROJECT_ROOT_DIR}/extensions/include/NvClothExt/ClothMeshQuadifier.h
@@ -178,4 +200,4 @@ IF(NOT ${NVCLOTH_LIBTYPE} STREQUAL "OBJECT")
 		COMPILE_PDB_NAME_RELEASE "NvCloth${CMAKE_RELEASE_POSTFIX}"
 	)
 ENDIF()
-MESSAGE("[NvCloth]cmake/common/NvCloth.cmake END")
-\ No newline at end of file
+MESSAGE("[NvCloth]cmake/common/NvCloth.cmake END")
diff --git a/NvCloth/compiler/cmake/ios/CMakeLists.txt b/NvCloth/compiler/cmake/ios/CMakeLists.txt
index c0c890e..bf36e95 100644
--- a/NvCloth/compiler/cmake/ios/CMakeLists.txt
+++ b/NvCloth/compiler/cmake/ios/CMakeLists.txt
@@ -13,7 +13,7 @@ IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
 	MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
 ENDIF()
 
-SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2 -Wno-unused-value -Wno-format-nonliteral -Wno-undef -Wno-double-promotion")
+SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2 -Wno-unused-value -Wno-format-nonliteral -Wno-undef -Wno-double-promotion -Wno-zero-as-null-pointer-constant")
 SET(CMAKE_SHARED_LINKER_FLAGS "")
 
 # Build debug info for all configurations
@@ -37,12 +37,6 @@ SET(PHYSX_IOS_RELEASE_COMPILE_DEFS NDEBUG;PX_SUPPORT_PVD=0)
 SET(PX_SELECT_COMPONENTS PxFoundation)
 FIND_PACKAGE(PxShared REQUIRED)
 
-# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment
-#  such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it.
-
-# Add PxShared as a dependency so that we can use project references
-ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/ios "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin")
-
 # Include all of the projects
 INCLUDE(NvCloth.cmake)
 
diff --git a/NvCloth/compiler/cmake/ios/NvCloth.cmake b/NvCloth/compiler/cmake/ios/NvCloth.cmake
index e837e4a..2da5516 100644
--- a/NvCloth/compiler/cmake/ios/NvCloth.cmake
+++ b/NvCloth/compiler/cmake/ios/NvCloth.cmake
@@ -42,11 +42,6 @@ SET(NVCLOTH_LIBTYPE STATIC)
 INCLUDE(../common/NvCloth.cmake)
 
 
-# Add linked libraries
-# TARGET_LINK_LIBRARIES(NvCloth PUBLIC ${NVTOOLSEXT_LIBRARIES} LowLevel LowLevelAABB LowLevelCloth LowLevelDynamics LowLevelParticles PhysXCommon PhysXGpu PxFoundation PxPvdSDK PxTask SceneQuery SimulationController)
-
-TARGET_LINK_LIBRARIES(NvCloth PUBLIC PxFoundation)
-
 SET_TARGET_PROPERTIES(NvCloth PROPERTIES 
 	LINK_FLAGS_DEBUG ""
 	LINK_FLAGS_CHECKED ""
diff --git a/NvCloth/compiler/cmake/linux/CMakeLists.txt b/NvCloth/compiler/cmake/linux/CMakeLists.txt
index 5bd8323..f8ba400 100644
--- a/NvCloth/compiler/cmake/linux/CMakeLists.txt
+++ b/NvCloth/compiler/cmake/linux/CMakeLists.txt
@@ -43,12 +43,6 @@ SET(PHYSX_LINUX_RELEASE_COMPILE_DEFS NDEBUG;PX_SUPPORT_PVD=0)
 SET(PX_SELECT_COMPONENTS PxFoundation)
 FIND_PACKAGE(PxShared REQUIRED)
 
-# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment
-#  such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it.
-
-# Add PxShared as a dependency so that we can use project references
-ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/linux "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin")
-
 # Include all of the projects
 INCLUDE(NvCloth.cmake)
 
diff --git a/NvCloth/compiler/cmake/linux/NvCloth.cmake b/NvCloth/compiler/cmake/linux/NvCloth.cmake
index 1d53df6..64188f0 100644
--- a/NvCloth/compiler/cmake/linux/NvCloth.cmake
+++ b/NvCloth/compiler/cmake/linux/NvCloth.cmake
@@ -30,6 +30,8 @@ SET(NVCLOTH_PLATFORM_INCLUDES
 )
 
 SET(NVCLOTH_PLATFORM_SOURCE_FILES
+	${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixAtomic.cpp
+	${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixFPU.h
 	#${PROJECT_ROOT_DIR}/src/neon/NeonCollision.cpp
 	#${PROJECT_ROOT_DIR}/src/neon/NeonSelfCollision.cpp
 	#${PROJECT_ROOT_DIR}/src/neon/NeonSolverKernel.cpp
@@ -128,11 +130,6 @@ ENDIF()
 # include common NvCloth settings
 INCLUDE(../common/NvCloth.cmake)
 
-
-# Add linked libraries
-# TARGET_LINK_LIBRARIES(NvCloth PUBLIC ${NVTOOLSEXT_LIBRARIES} LowLevel LowLevelAABB LowLevelCloth LowLevelDynamics LowLevelParticles PhysXCommon PhysXGpu PxFoundation PxPvdSDK PxTask SceneQuery SimulationController)
-
-TARGET_LINK_LIBRARIES(NvCloth PUBLIC PxFoundation)
 TARGET_LINK_LIBRARIES(NvCloth PUBLIC ${CUDA_CUDA_LIBRARY})
 
 SET_TARGET_PROPERTIES(NvCloth PROPERTIES 
@@ -144,4 +141,4 @@ SET_TARGET_PROPERTIES(NvCloth PROPERTIES
 
 # enable -fPIC so we can link static libs with the editor
 SET_TARGET_PROPERTIES(NvCloth PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-MESSAGE("[NvCloth]cmake/linux/NvCloth.cmake END")
-\ No newline at end of file
+MESSAGE("[NvCloth]cmake/linux/NvCloth.cmake END")
diff --git a/NvCloth/compiler/cmake/mac/CMakeLists.txt b/NvCloth/compiler/cmake/mac/CMakeLists.txt
index 83ca14d..903e545 100644
--- a/NvCloth/compiler/cmake/mac/CMakeLists.txt
+++ b/NvCloth/compiler/cmake/mac/CMakeLists.txt
@@ -45,12 +45,6 @@ SET(PHYSX_MAC_RELEASE_COMPILE_DEFS NDEBUG;PX_SUPPORT_PVD=0)
 SET(PX_SELECT_COMPONENTS PxFoundation)
 FIND_PACKAGE(PxShared REQUIRED)
 
-# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment
-#  such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it.
-
-# Add PxShared as a dependency so that we can use project references
-ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/mac "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin")
-
 # Include all of the projects
 INCLUDE(NvCloth.cmake)
 
diff --git a/NvCloth/compiler/cmake/mac/NvCloth.cmake b/NvCloth/compiler/cmake/mac/NvCloth.cmake
index faea6fd..086b508 100644
--- a/NvCloth/compiler/cmake/mac/NvCloth.cmake
+++ b/NvCloth/compiler/cmake/mac/NvCloth.cmake
@@ -15,6 +15,8 @@ SET(NVCLOTH_PLATFORM_INCLUDES
 )
 
 SET(NVCLOTH_PLATFORM_SOURCE_FILES
+	${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixAtomic.cpp
+	${PROJECT_ROOT_DIR}/src/ps/unix/PsUnixFPU.h
 	#${PROJECT_ROOT_DIR}/src/neon/NeonCollision.cpp
 	#${PROJECT_ROOT_DIR}/src/neon/NeonSelfCollision.cpp
 	#${PROJECT_ROOT_DIR}/src/neon/NeonSolverKernel.cpp
@@ -42,11 +44,6 @@ SET(NVCLOTH_LIBTYPE SHARED)
 INCLUDE(../common/NvCloth.cmake)
 
 
-# Add linked libraries
-# TARGET_LINK_LIBRARIES(NvCloth PUBLIC ${NVTOOLSEXT_LIBRARIES} LowLevel LowLevelAABB LowLevelCloth LowLevelDynamics LowLevelParticles PhysXCommon PhysXGpu PxFoundation PxPvdSDK PxTask SceneQuery SimulationController)
-
-TARGET_LINK_LIBRARIES(NvCloth PUBLIC PxFoundation)
-
 SET_TARGET_PROPERTIES(NvCloth PROPERTIES 
 	LINK_FLAGS_DEBUG ""
 	LINK_FLAGS_CHECKED ""
diff --git a/NvCloth/compiler/cmake/windows/CMakeLists.txt b/NvCloth/compiler/cmake/windows/CMakeLists.txt
index 9e8f66b..30f2a65 100644
--- a/NvCloth/compiler/cmake/windows/CMakeLists.txt
+++ b/NvCloth/compiler/cmake/windows/CMakeLists.txt
@@ -69,12 +69,6 @@ SET(CMAKE_RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}_${LIBPATH_SUFFIX}")
 SET(PX_SELECT_COMPONENTS PxFoundation)
 FIND_PACKAGE(PxShared REQUIRED)
 
-# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment
-#  such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it.
-
-# Add PxShared as a dependency so that we can use project references
-ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/windows "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin")
-
 # Include all of the projects
 INCLUDE(NvCloth.cmake)
 IF(DEFINED PX_GENERATE_GPU_PROJECTS)
diff --git a/NvCloth/compiler/cmake/windows/NvCloth.cmake b/NvCloth/compiler/cmake/windows/NvCloth.cmake
index cc8ca0f..065ea18 100644
--- a/NvCloth/compiler/cmake/windows/NvCloth.cmake
+++ b/NvCloth/compiler/cmake/windows/NvCloth.cmake
@@ -23,7 +23,11 @@ ENDIF()
 SET(NVCLOTH_PLATFORM_INCLUDES PRIVATE ${CUDA_INCLUDE_DIRS})
 
 
-SET(NVCLOTH_PLATFORM_SOURCE_FILES "" )
+SET(NVCLOTH_PLATFORM_SOURCE_FILES 
+	${PROJECT_ROOT_DIR}/src/ps/windows/PsWindowsAtomic.cpp
+	${PROJECT_ROOT_DIR}/src/ps/windows/PsWindowsFPU.h
+	${PROJECT_ROOT_DIR}/src/ps/windows/PsWindowsInclude.h
+)
 IF(${NV_CLOTH_ENABLE_CUDA})
 LIST(APPEND NVCLOTH_PLATFORM_SOURCE_FILES
 	${PROJECT_ROOT_DIR}/src/cuda/CuCheckSuccess.h
@@ -48,6 +52,7 @@ LIST(APPEND NVCLOTH_PLATFORM_SOURCE_FILES
 	${PROJECT_ROOT_DIR}/src/cuda/CuSolver.h
 	${PROJECT_ROOT_DIR}/src/cuda/CuSolverKernel.h
 	${PROJECT_ROOT_DIR}/src/cuda/CuSolverKernelBlob.h
+	${PROJECT_ROOT_DIR}/include/NvCloth/ps/windows/PsWindowsIntrinsics.h
 )
 ENDIF()
 
@@ -164,13 +169,12 @@ INCLUDE(../common/NvCloth.cmake)
 
 # Add linked libraries
 
-TARGET_LINK_LIBRARIES(NvCloth PUBLIC PxFoundation)
 TARGET_LINK_LIBRARIES(NvCloth PUBLIC ${CUDA_CUDA_LIBRARY})
 
 SET_TARGET_PROPERTIES(NvCloth PROPERTIES 
-	LINK_FLAGS_DEBUG "/DELAYLOAD:nvcuda.dll /MAP /DELAYLOAD:PxFoundationDEBUG_${LIBPATH_SUFFIX}.dll /DEBUG"
-	LINK_FLAGS_CHECKED "/DELAYLOAD:nvcuda.dll /MAP /DELAYLOAD:PxFoundationCHECKED_${LIBPATH_SUFFIX}.dll"
-	LINK_FLAGS_PROFILE "/DELAYLOAD:nvcuda.dll /MAP /DELAYLOAD:PxFoundationPROFILE_${LIBPATH_SUFFIX}.dll /INCREMENTAL:NO /DEBUG"
-	LINK_FLAGS_RELEASE "/DELAYLOAD:nvcuda.dll /MAP /DELAYLOAD:PxFoundation_${LIBPATH_SUFFIX}.dll /INCREMENTAL:NO"
+	LINK_FLAGS_DEBUG "/DELAYLOAD:nvcuda.dll /MAP  /DEBUG"
+	LINK_FLAGS_CHECKED "/DELAYLOAD:nvcuda.dll /MAP "
+	LINK_FLAGS_PROFILE "/DELAYLOAD:nvcuda.dll /MAP /INCREMENTAL:NO /DEBUG"
+	LINK_FLAGS_RELEASE "/DELAYLOAD:nvcuda.dll /MAP /INCREMENTAL:NO"
 )
 MESSAGE("[NvCloth]cmake/windows/NvCloth.cmake END")
 \ No newline at end of file