early-access version 2853
This commit is contained in:
pineappleEA
58
externals/vcpkg/ports/physx/fix-compiler-flag.patch
vendored
Executable file
58
externals/vcpkg/ports/physx/fix-compiler-flag.patch
vendored
Executable file
@@ -0,0 +1,58 @@
|
||||
diff --git a/physx/compiler/public/CMakeLists.txt b/physx/compiler/public/CMakeLists.txt
|
||||
index 77776ca7..bd7b496d 100644
|
||||
--- a/physx/compiler/public/CMakeLists.txt
|
||||
+++ b/physx/compiler/public/CMakeLists.txt
|
||||
@@ -33,6 +33,8 @@ ENDIF()
|
||||
|
||||
project(PhysXSDK C CXX)
|
||||
|
||||
+SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE INTERNAL "PhysX Debug CXX Flags")
|
||||
+
|
||||
OPTION(PX_BUILDSNIPPETS "Generate the snippets" OFF)
|
||||
OPTION(PX_BUILDPUBLICSAMPLES "Generate the samples" OFF)
|
||||
OPTION(PX_CMAKE_SUPPRESS_REGENERATION "Disable zero_check projects" OFF)
|
||||
diff --git a/physx/source/compiler/cmake/uwp/CMakeLists.txt b/physx/source/compiler/cmake/uwp/CMakeLists.txt
|
||||
index 20dcb6ae..c7e03c3e 100644
|
||||
--- a/physx/source/compiler/cmake/uwp/CMakeLists.txt
|
||||
+++ b/physx/source/compiler/cmake/uwp/CMakeLists.txt
|
||||
@@ -39,11 +39,13 @@ ELSE()
|
||||
ENDIF()
|
||||
|
||||
# Cache the CXX flags so the other CMakeLists.txt can use them if needed
|
||||
-SET(PHYSX_CXX_FLAGS "/Wall /d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
|
||||
+SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
|
||||
+if(FALSE)
|
||||
SET(PHYSX_CXX_FLAGS_DEBUG "/Od ${WINCRT_DEBUG} /Zi" CACHE INTERNAL "PhysX Debug CXX Flags")
|
||||
SET(PHYSX_CXX_FLAGS_CHECKED "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Checked CXX Flags")
|
||||
SET(PHYSX_CXX_FLAGS_PROFILE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Profile CXX Flags")
|
||||
SET(PHYSX_CXX_FLAGS_RELEASE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Release CXX Flags")
|
||||
+endif()
|
||||
|
||||
# These flags are local to the directory the CMakeLists.txt is in, so don't get carried over to OTHER CMakeLists.txt (thus the CACHE variables above)
|
||||
SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS})
|
||||
diff --git a/physx/source/compiler/cmake/windows/CMakeLists.txt b/physx/source/compiler/cmake/windows/CMakeLists.txt
|
||||
index a1ab3596..dbd20fb0 100644
|
||||
--- a/physx/source/compiler/cmake/windows/CMakeLists.txt
|
||||
+++ b/physx/source/compiler/cmake/windows/CMakeLists.txt
|
||||
@@ -41,17 +41,19 @@ ELSE()
|
||||
SET(PHYSX_FP_MODE "/fp:fast")
|
||||
ENDIF()
|
||||
IF(CMAKE_CL_64)
|
||||
- SET(PHYSX_CXX_FLAGS "/d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
|
||||
+ SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
|
||||
ELSE()
|
||||
- SET(PHYSX_CXX_FLAGS "/arch:SSE2 /d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
|
||||
+ SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} /arch:SSE2 ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
|
||||
ENDIF()
|
||||
|
||||
+if(FALSE)
|
||||
SET(PHYSX_CXX_FLAGS_DEBUG "/Od ${WINCRT_DEBUG} /RTCu /Zi" CACHE INTERNAL "PhysX Debug CXX Flags")
|
||||
# PT: changed /Ox to /O2 because "the /Ox compiler option enables only a subset of the speed optimization options enabled by /O2."
|
||||
# See https://docs.microsoft.com/en-us/cpp/build/reference/ox-full-optimization?view=vs-2019
|
||||
SET(PHYSX_CXX_FLAGS_CHECKED "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Checked CXX Flags")
|
||||
SET(PHYSX_CXX_FLAGS_PROFILE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Profile CXX Flags")
|
||||
SET(PHYSX_CXX_FLAGS_RELEASE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Release CXX Flags")
|
||||
+endif()
|
||||
|
||||
# cache lib type defs
|
||||
IF(PX_GENERATE_STATIC_LIBRARIES)
|
||||
157
externals/vcpkg/ports/physx/portfile.cmake
vendored
Executable file
157
externals/vcpkg/ports/physx/portfile.cmake
vendored
Executable file
@@ -0,0 +1,157 @@
|
||||
vcpkg_download_distfile(
|
||||
patch1
|
||||
URLS "https://github.com/NVIDIAGameWorks/PhysX/commit/ada4fccf04e5a5832af1353d6d1f91de691aa47d.patch"
|
||||
FILENAME "physx-PR569-ada4fccf.patch"
|
||||
SHA512 ec2fc2fce0b5aab4d42b77f21373bf067f129543e672516477513419241c56b99f2d663b992cb29d296933440e7e7cc31a57198f6fcc78d6eac26b7706c1e937
|
||||
)
|
||||
|
||||
vcpkg_download_distfile(
|
||||
patch2
|
||||
URLS "https://github.com/NVIDIAGameWorks/PhysX/commit/d590c88e3cbf0fb682726abf7d7c16417855084f.patch"
|
||||
FILENAME "physx-PR569-d590c88e.patch"
|
||||
SHA512 4eb7630db1cb10b2372220c3706dfe255075f466c6b2b12654c9fbc3b17c4df69d7b91e6f0d798c92a4cb8806e1c34b66bb52b46d9358d643ca62ec0de321fd2
|
||||
)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO NVIDIAGameWorks/PhysX
|
||||
REF 93c6dd21b545605185f2febc8eeacebe49a99479
|
||||
SHA512 c9f50255ca9e0f1ebdb9926992315a62b77e2eea3addd4e65217283490714e71e24f2f687717dd8eb155078a1a6b25c9fadc123ce8bc4c5615f7ac66cd6b11aa
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-compiler-flag.patch
|
||||
"${patch1}"
|
||||
"${patch2}"
|
||||
remove-werror.patch
|
||||
)
|
||||
|
||||
if(NOT DEFINED RELEASE_CONFIGURATION)
|
||||
set(RELEASE_CONFIGURATION "release")
|
||||
endif()
|
||||
set(DEBUG_CONFIGURATION "debug")
|
||||
|
||||
set(OPTIONS
|
||||
"-DPHYSX_ROOT_DIR=${SOURCE_PATH}/physx"
|
||||
"-DPXSHARED_PATH=${SOURCE_PATH}/pxshared"
|
||||
"-DPXSHARED_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}"
|
||||
"-DCMAKEMODULES_PATH=${SOURCE_PATH}/externals/cmakemodules"
|
||||
"-DCMAKEMODULES_NAME=CMakeModules"
|
||||
"-DCMAKE_MODULES_VERSION=1.27"
|
||||
"-DPX_BUILDSNIPPETS=OFF"
|
||||
"-DPX_BUILDPUBLICSAMPLES=OFF"
|
||||
"-DPX_FLOAT_POINT_PRECISE_MATH=OFF"
|
||||
"-DPX_COPY_EXTERNAL_DLL=OFF"
|
||||
"-DGPU_DLL_COPIED=ON"
|
||||
)
|
||||
|
||||
set(OPTIONS_RELEASE
|
||||
"-DPX_OUTPUT_BIN_DIR=${CURRENT_PACKAGES_DIR}"
|
||||
"-DPX_OUTPUT_LIB_DIR=${CURRENT_PACKAGES_DIR}"
|
||||
)
|
||||
set(OPTIONS_DEBUG
|
||||
"-DPX_OUTPUT_BIN_DIR=${CURRENT_PACKAGES_DIR}/debug"
|
||||
"-DPX_OUTPUT_LIB_DIR=${CURRENT_PACKAGES_DIR}/debug"
|
||||
"-DNV_USE_DEBUG_WINCRT=ON"
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=uwp")
|
||||
set(configure_options WINDOWS_USE_MSBUILD)
|
||||
elseif(VCPKG_TARGET_IS_WINDOWS)
|
||||
list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=windows")
|
||||
elseif(VCPKG_TARGET_IS_OSX)
|
||||
list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=mac")
|
||||
elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_FREEBSD)
|
||||
list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=linux")
|
||||
elseif(VCPKG_TARGET_IS_ANDROID)
|
||||
list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=android")
|
||||
else()
|
||||
message(FATAL_ERROR "Unhandled or unsupported target platform.")
|
||||
endif()
|
||||
|
||||
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
|
||||
list(APPEND OPTIONS "-DNV_FORCE_64BIT_SUFFIX=ON" "-DNV_FORCE_32BIT_SUFFIX=OFF")
|
||||
endif()
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
list(APPEND OPTIONS "-DPX_GENERATE_STATIC_LIBRARIES=OFF")
|
||||
else()
|
||||
list(APPEND OPTIONS "-DPX_GENERATE_STATIC_LIBRARIES=ON")
|
||||
endif()
|
||||
|
||||
if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
|
||||
list(APPEND OPTIONS "-DNV_USE_STATIC_WINCRT=OFF")
|
||||
else()
|
||||
list(APPEND OPTIONS "-DNV_USE_STATIC_WINCRT=ON")
|
||||
endif()
|
||||
|
||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
||||
list(APPEND OPTIONS "-DPX_OUTPUT_ARCH=arm")
|
||||
else()
|
||||
list(APPEND OPTIONS "-DPX_OUTPUT_ARCH=x86")
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public"
|
||||
${configure_options}
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS ${OPTIONS}
|
||||
OPTIONS_DEBUG ${OPTIONS_DEBUG}
|
||||
OPTIONS_RELEASE ${OPTIONS_RELEASE}
|
||||
)
|
||||
vcpkg_cmake_install()
|
||||
|
||||
# NVIDIA Gameworks release structure is generally something like <compiler>/<configuration>/[artifact]
|
||||
# It would be nice to patch this out, but that directory structure is hardcoded over many cmake files.
|
||||
# So, we have this helpful helper to copy the bins and libs out.
|
||||
function(fixup_physx_artifacts)
|
||||
macro(_fixup _IN_DIRECTORY _OUT_DIRECTORY)
|
||||
foreach(_SUFFIX IN LISTS _fpa_SUFFIXES)
|
||||
file(GLOB_RECURSE _ARTIFACTS
|
||||
LIST_DIRECTORIES false
|
||||
"${CURRENT_PACKAGES_DIR}/${_IN_DIRECTORY}/*${_SUFFIX}"
|
||||
)
|
||||
if(_ARTIFACTS)
|
||||
file(COPY ${_ARTIFACTS} DESTINATION "${CURRENT_PACKAGES_DIR}/${_OUT_DIRECTORY}")
|
||||
endif()
|
||||
endforeach()
|
||||
endmacro()
|
||||
|
||||
cmake_parse_arguments(_fpa "" "DIRECTORY" "SUFFIXES" ${ARGN})
|
||||
_fixup("bin" ${_fpa_DIRECTORY})
|
||||
_fixup("debug/bin" "debug/${_fpa_DIRECTORY}")
|
||||
endfunction()
|
||||
|
||||
fixup_physx_artifacts(
|
||||
DIRECTORY "lib"
|
||||
SUFFIXES ${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}
|
||||
)
|
||||
fixup_physx_artifacts(
|
||||
DIRECTORY "bin"
|
||||
SUFFIXES ${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX} ".pdb"
|
||||
)
|
||||
|
||||
# Remove compiler directory and descendents.
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/bin/"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/bin/"
|
||||
)
|
||||
else()
|
||||
file(GLOB PHYSX_ARTIFACTS LIST_DIRECTORIES true
|
||||
"${CURRENT_PACKAGES_DIR}/bin/*"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/bin/*"
|
||||
)
|
||||
foreach(_ARTIFACT IN LISTS PHYSX_ARTIFACTS)
|
||||
if(IS_DIRECTORY ${_ARTIFACT})
|
||||
file(REMOVE_RECURSE ${_ARTIFACT})
|
||||
endif()
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/source"
|
||||
"${CURRENT_PACKAGES_DIR}/source"
|
||||
)
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
52
externals/vcpkg/ports/physx/remove-werror.patch
vendored
Executable file
52
externals/vcpkg/ports/physx/remove-werror.patch
vendored
Executable file
@@ -0,0 +1,52 @@
|
||||
diff --git a/physx/source/compiler/cmake/android/CMakeLists.txt b/physx/source/compiler/cmake/android/CMakeLists.txt
|
||||
index 06e0d98..2e5454d 100644
|
||||
--- a/physx/source/compiler/cmake/android/CMakeLists.txt
|
||||
+++ b/physx/source/compiler/cmake/android/CMakeLists.txt
|
||||
@@ -52,6 +52,8 @@ SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags")
|
||||
|
||||
|
||||
# These flags are local to the directory the CMakeLists.txt is in
|
||||
+string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}")
|
||||
+set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX")
|
||||
SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS})
|
||||
|
||||
SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG})
|
||||
diff --git a/physx/source/compiler/cmake/ios/CMakeLists.txt b/physx/source/compiler/cmake/ios/CMakeLists.txt
|
||||
index 5605e9a..b40500b 100644
|
||||
--- a/physx/source/compiler/cmake/ios/CMakeLists.txt
|
||||
+++ b/physx/source/compiler/cmake/ios/CMakeLists.txt
|
||||
@@ -39,6 +39,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3 -g" CACHE INTERNAL "PhysX Profile CXX Flags")
|
||||
SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags")
|
||||
|
||||
# These flags are local to the directory the CMakeLists.txt is in
|
||||
+string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}")
|
||||
+set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX")
|
||||
SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS})
|
||||
|
||||
SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG})
|
||||
diff --git a/physx/source/compiler/cmake/linux/CMakeLists.txt b/physx/source/compiler/cmake/linux/CMakeLists.txt
|
||||
index aba5336..fd5f813 100644
|
||||
--- a/physx/source/compiler/cmake/linux/CMakeLists.txt
|
||||
+++ b/physx/source/compiler/cmake/linux/CMakeLists.txt
|
||||
@@ -45,6 +45,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3" CACHE INTERNAL "PhysX Profile CXX Flags")
|
||||
SET(PHYSX_CXX_FLAGS_RELEASE "-O3" CACHE INTERNAL "PhysX Release CXX Flags")
|
||||
|
||||
# These flags are local to the directory the CMakeLists.txt is in, so don't get carried over to OTHER CMakeLists.txt (thus the CACHE variables above)
|
||||
+string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}")
|
||||
+set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX")
|
||||
SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS})
|
||||
|
||||
SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG})
|
||||
diff --git a/physx/source/compiler/cmake/mac/CMakeLists.txt b/physx/source/compiler/cmake/mac/CMakeLists.txt
|
||||
index bfd1357..cffb090 100644
|
||||
--- a/physx/source/compiler/cmake/mac/CMakeLists.txt
|
||||
+++ b/physx/source/compiler/cmake/mac/CMakeLists.txt
|
||||
@@ -49,6 +49,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3 -g" CACHE INTERNAL "PhysX Profile CXX Flags")
|
||||
SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags")
|
||||
|
||||
# These flags are local to the directory the CMakeLists.txt is in
|
||||
+string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}")
|
||||
+set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX")
|
||||
SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS})
|
||||
|
||||
SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG})
|
||||
15
externals/vcpkg/ports/physx/vcpkg.json
vendored
Executable file
15
externals/vcpkg/ports/physx/vcpkg.json
vendored
Executable file
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"name": "physx",
|
||||
"version": "4.1.2",
|
||||
"port-version": 4,
|
||||
"description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs",
|
||||
"homepage": "https://github.com/NVIDIAGameWorks/PhysX",
|
||||
"license": null,
|
||||
"supports": "!mingw & !(windows & arm)",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user