diff options
Diffstat (limited to 'NvCloth/compiler/cmake/android')
| -rw-r--r-- | NvCloth/compiler/cmake/android/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | NvCloth/compiler/cmake/android/NvCloth.cmake | 5 |
2 files changed, 5 insertions, 12 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 |