diff --git a/win32/CMakeLists.txt b/win32/CMakeLists.txt index ff9be014..4c927bab 100644 --- a/win32/CMakeLists.txt +++ b/win32/CMakeLists.txt @@ -275,11 +275,10 @@ list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb) if(USE_PHYSICS_PHYSX) set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK) foreach(PX IN LISTS PhysXSDK) - add_library(${PX} SHARED IMPORTED GLOBAL) + add_library(${PX} STATIC IMPORTED GLOBAL) set_target_properties(${PX} PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/${PX}_static_32.dll - IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/${PX}_static_32.lib - + IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/debug/${PX}_static_32.lib + IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/release/${PX}_static_32.lib ) endforeach() else() diff --git a/win32/libs/PhysX/debug/PhysXCharacterKinematic_static_32.lib b/win32/libs/PhysX/debug/PhysXCharacterKinematic_static_32.lib new file mode 100644 index 00000000..789e6407 Binary files /dev/null and b/win32/libs/PhysX/debug/PhysXCharacterKinematic_static_32.lib differ diff --git a/win32/libs/PhysX/debug/PhysXCommon_static_32.lib b/win32/libs/PhysX/debug/PhysXCommon_static_32.lib new file mode 100644 index 00000000..50091f8a Binary files /dev/null and b/win32/libs/PhysX/debug/PhysXCommon_static_32.lib differ diff --git a/win32/libs/PhysX/debug/PhysXCooking_static_32.lib b/win32/libs/PhysX/debug/PhysXCooking_static_32.lib new file mode 100644 index 00000000..bf899ac1 Binary files /dev/null and b/win32/libs/PhysX/debug/PhysXCooking_static_32.lib differ diff --git a/win32/libs/PhysX/debug/PhysXExtensions_static_32.lib b/win32/libs/PhysX/debug/PhysXExtensions_static_32.lib new file mode 100644 index 00000000..b72baac2 Binary files /dev/null and b/win32/libs/PhysX/debug/PhysXExtensions_static_32.lib differ diff --git a/win32/libs/PhysX/debug/PhysXFoundation_static_32.lib b/win32/libs/PhysX/debug/PhysXFoundation_static_32.lib new file mode 100644 index 00000000..c92cb564 Binary files /dev/null and b/win32/libs/PhysX/debug/PhysXFoundation_static_32.lib differ diff --git a/win32/libs/PhysX/debug/PhysXPvdSDK_static_32.lib b/win32/libs/PhysX/debug/PhysXPvdSDK_static_32.lib new file mode 100644 index 00000000..727db072 Binary files /dev/null and b/win32/libs/PhysX/debug/PhysXPvdSDK_static_32.lib differ diff --git a/win32/libs/PhysX/debug/PhysXVehicle_static_32.lib b/win32/libs/PhysX/debug/PhysXVehicle_static_32.lib new file mode 100644 index 00000000..e0d4bea6 Binary files /dev/null and b/win32/libs/PhysX/debug/PhysXVehicle_static_32.lib differ diff --git a/win32/libs/PhysX/debug/PhysX_static_32.lib b/win32/libs/PhysX/debug/PhysX_static_32.lib new file mode 100644 index 00000000..97218a0b Binary files /dev/null and b/win32/libs/PhysX/debug/PhysX_static_32.lib differ diff --git a/win32/libs/PhysX/PhysXCharacterKinematic_static_32.lib b/win32/libs/PhysX/release/PhysXCharacterKinematic_static_32.lib similarity index 100% rename from win32/libs/PhysX/PhysXCharacterKinematic_static_32.lib rename to win32/libs/PhysX/release/PhysXCharacterKinematic_static_32.lib diff --git a/win32/libs/PhysX/PhysXCommon_static_32.lib b/win32/libs/PhysX/release/PhysXCommon_static_32.lib similarity index 100% rename from win32/libs/PhysX/PhysXCommon_static_32.lib rename to win32/libs/PhysX/release/PhysXCommon_static_32.lib diff --git a/win32/libs/PhysX/PhysXCooking_static_32.lib b/win32/libs/PhysX/release/PhysXCooking_static_32.lib similarity index 100% rename from win32/libs/PhysX/PhysXCooking_static_32.lib rename to win32/libs/PhysX/release/PhysXCooking_static_32.lib diff --git a/win32/libs/PhysX/PhysXExtensions_static_32.lib b/win32/libs/PhysX/release/PhysXExtensions_static_32.lib similarity index 100% rename from win32/libs/PhysX/PhysXExtensions_static_32.lib rename to win32/libs/PhysX/release/PhysXExtensions_static_32.lib diff --git a/win32/libs/PhysX/PhysXFoundation_static_32.lib b/win32/libs/PhysX/release/PhysXFoundation_static_32.lib similarity index 100% rename from win32/libs/PhysX/PhysXFoundation_static_32.lib rename to win32/libs/PhysX/release/PhysXFoundation_static_32.lib diff --git a/win32/libs/PhysX/PhysXPvdSDK_static_32.lib b/win32/libs/PhysX/release/PhysXPvdSDK_static_32.lib similarity index 100% rename from win32/libs/PhysX/PhysXPvdSDK_static_32.lib rename to win32/libs/PhysX/release/PhysXPvdSDK_static_32.lib diff --git a/win32/libs/PhysX/PhysXVehicle_static_32.lib b/win32/libs/PhysX/release/PhysXVehicle_static_32.lib similarity index 100% rename from win32/libs/PhysX/PhysXVehicle_static_32.lib rename to win32/libs/PhysX/release/PhysXVehicle_static_32.lib diff --git a/win32/libs/PhysX/PhysX_static_32.lib b/win32/libs/PhysX/release/PhysX_static_32.lib similarity index 100% rename from win32/libs/PhysX/PhysX_static_32.lib rename to win32/libs/PhysX/release/PhysX_static_32.lib diff --git a/win64/CMakeLists.txt b/win64/CMakeLists.txt index 7816ddb0..a2bb110c 100644 --- a/win64/CMakeLists.txt +++ b/win64/CMakeLists.txt @@ -277,7 +277,8 @@ if(USE_PHYSICS_PHYSX) foreach(PX IN LISTS PhysXSDK) add_library(${PX} STATIC IMPORTED GLOBAL) set_target_properties(${PX} PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/${PX}_static_64.lib + IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/debug/${PX}_static_64.lib + IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/release/${PX}_static_64.lib ) endforeach() else() diff --git a/win64/libs/PhysX/debug/PhysXCharacterKinematic_static_64.lib b/win64/libs/PhysX/debug/PhysXCharacterKinematic_static_64.lib new file mode 100644 index 00000000..2359d827 Binary files /dev/null and b/win64/libs/PhysX/debug/PhysXCharacterKinematic_static_64.lib differ diff --git a/win64/libs/PhysX/debug/PhysXCommon_static_64.lib b/win64/libs/PhysX/debug/PhysXCommon_static_64.lib new file mode 100644 index 00000000..f110e64a Binary files /dev/null and b/win64/libs/PhysX/debug/PhysXCommon_static_64.lib differ diff --git a/win64/libs/PhysX/debug/PhysXCooking_static_64.lib b/win64/libs/PhysX/debug/PhysXCooking_static_64.lib new file mode 100644 index 00000000..911fe67b Binary files /dev/null and b/win64/libs/PhysX/debug/PhysXCooking_static_64.lib differ diff --git a/win64/libs/PhysX/debug/PhysXExtensions_static_64.lib b/win64/libs/PhysX/debug/PhysXExtensions_static_64.lib new file mode 100644 index 00000000..019b96a5 Binary files /dev/null and b/win64/libs/PhysX/debug/PhysXExtensions_static_64.lib differ diff --git a/win64/libs/PhysX/debug/PhysXFoundation_static_64.lib b/win64/libs/PhysX/debug/PhysXFoundation_static_64.lib new file mode 100644 index 00000000..0b9bb79a Binary files /dev/null and b/win64/libs/PhysX/debug/PhysXFoundation_static_64.lib differ diff --git a/win64/libs/PhysX/debug/PhysXPvdSDK_static_64.lib b/win64/libs/PhysX/debug/PhysXPvdSDK_static_64.lib new file mode 100644 index 00000000..77d25d7e Binary files /dev/null and b/win64/libs/PhysX/debug/PhysXPvdSDK_static_64.lib differ diff --git a/win64/libs/PhysX/debug/PhysXVehicle_static_64.lib b/win64/libs/PhysX/debug/PhysXVehicle_static_64.lib new file mode 100644 index 00000000..5a9f0345 Binary files /dev/null and b/win64/libs/PhysX/debug/PhysXVehicle_static_64.lib differ diff --git a/win64/libs/PhysX/debug/PhysX_static_64.lib b/win64/libs/PhysX/debug/PhysX_static_64.lib new file mode 100644 index 00000000..795ebb8a Binary files /dev/null and b/win64/libs/PhysX/debug/PhysX_static_64.lib differ diff --git a/win64/libs/PhysX/PhysXCharacterKinematic_static_64.lib b/win64/libs/PhysX/release/PhysXCharacterKinematic_static_64.lib similarity index 100% rename from win64/libs/PhysX/PhysXCharacterKinematic_static_64.lib rename to win64/libs/PhysX/release/PhysXCharacterKinematic_static_64.lib diff --git a/win64/libs/PhysX/PhysXCommon_static_64.lib b/win64/libs/PhysX/release/PhysXCommon_static_64.lib similarity index 100% rename from win64/libs/PhysX/PhysXCommon_static_64.lib rename to win64/libs/PhysX/release/PhysXCommon_static_64.lib diff --git a/win64/libs/PhysX/PhysXCooking_static_64.lib b/win64/libs/PhysX/release/PhysXCooking_static_64.lib similarity index 100% rename from win64/libs/PhysX/PhysXCooking_static_64.lib rename to win64/libs/PhysX/release/PhysXCooking_static_64.lib diff --git a/win64/libs/PhysX/PhysXExtensions_static_64.lib b/win64/libs/PhysX/release/PhysXExtensions_static_64.lib similarity index 100% rename from win64/libs/PhysX/PhysXExtensions_static_64.lib rename to win64/libs/PhysX/release/PhysXExtensions_static_64.lib diff --git a/win64/libs/PhysX/PhysXFoundation_static_64.lib b/win64/libs/PhysX/release/PhysXFoundation_static_64.lib similarity index 100% rename from win64/libs/PhysX/PhysXFoundation_static_64.lib rename to win64/libs/PhysX/release/PhysXFoundation_static_64.lib diff --git a/win64/libs/PhysX/PhysXPvdSDK_static_64.lib b/win64/libs/PhysX/release/PhysXPvdSDK_static_64.lib similarity index 100% rename from win64/libs/PhysX/PhysXPvdSDK_static_64.lib rename to win64/libs/PhysX/release/PhysXPvdSDK_static_64.lib diff --git a/win64/libs/PhysX/PhysXVehicle_static_64.lib b/win64/libs/PhysX/release/PhysXVehicle_static_64.lib similarity index 100% rename from win64/libs/PhysX/PhysXVehicle_static_64.lib rename to win64/libs/PhysX/release/PhysXVehicle_static_64.lib diff --git a/win64/libs/PhysX/PhysX_static_64.lib b/win64/libs/PhysX/release/PhysX_static_64.lib similarity index 100% rename from win64/libs/PhysX/PhysX_static_64.lib rename to win64/libs/PhysX/release/PhysX_static_64.lib