mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 08:39:01 +08:00
[physx] Use /Z7 instead of /Zi to integrate the debug info when building static (#15934)
* [physx] Use /Z7 instead of /Zi to integrate the debug message when building static * update version record * [physx] Add homepage * update version record * [physx] Re-fix flags, using toolchain set * update version record
This commit is contained in:
parent
37289e26fc
commit
5f0139b7e2
@ -1,4 +1,5 @@
|
|||||||
Source: physx
|
Source: physx
|
||||||
Version: 4.1.1
|
Version: 4.1.1
|
||||||
Port-Version: 6
|
Port-Version: 7
|
||||||
|
Homepage: https://github.com/NVIDIAGameWorks/PhysX
|
||||||
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
|
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
|
||||||
|
37
ports/physx/fix-compiler-flag.patch
Normal file
37
ports/physx/fix-compiler-flag.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
diff --git a/physx/compiler/public/CMakeLists.txt b/physx/compiler/public/CMakeLists.txt
|
||||||
|
index bd85eee..f32fe82 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/windows/CMakeLists.txt b/physx/source/compiler/cmake/windows/CMakeLists.txt
|
||||||
|
index c772333..e8a243c 100644
|
||||||
|
--- a/physx/source/compiler/cmake/windows/CMakeLists.txt
|
||||||
|
+++ b/physx/source/compiler/cmake/windows/CMakeLists.txt
|
||||||
|
@@ -41,15 +41,17 @@ 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 (0)
|
||||||
|
SET(PHYSX_CXX_FLAGS_DEBUG "/Od ${WINCRT_DEBUG} /RTCu /Zi" CACHE INTERNAL "PhysX Debug CXX Flags")
|
||||||
|
SET(PHYSX_CXX_FLAGS_CHECKED "/Ox ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Checked CXX Flags")
|
||||||
|
SET(PHYSX_CXX_FLAGS_PROFILE "/Ox ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Profile CXX Flags")
|
||||||
|
SET(PHYSX_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Release CXX Flags")
|
||||||
|
+endif()
|
||||||
|
|
||||||
|
# cache lib type defs
|
||||||
|
IF(PX_GENERATE_STATIC_LIBRARIES)
|
@ -11,6 +11,7 @@ vcpkg_from_github(
|
|||||||
msvc_142_bug_workaround.patch
|
msvc_142_bug_workaround.patch
|
||||||
vs16_3_typeinfo_header_fix.patch
|
vs16_3_typeinfo_header_fix.patch
|
||||||
fix_discarded_qualifiers.patch
|
fix_discarded_qualifiers.patch
|
||||||
|
fix-compiler-flag.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
if(NOT DEFINED RELEASE_CONFIGURATION)
|
if(NOT DEFINED RELEASE_CONFIGURATION)
|
||||||
@ -78,9 +79,6 @@ else()
|
|||||||
list(APPEND OPTIONS "-DPX_OUTPUT_ARCH=x86")
|
list(APPEND OPTIONS "-DPX_OUTPUT_ARCH=x86")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Replicate PhysX's CXX Flags here so we don't have to patch out /WX and -Wall
|
|
||||||
list(APPEND OPTIONS "-DPHYSX_CXX_FLAGS:INTERNAL=${VCPKG_CXX_FLAGS}")
|
|
||||||
|
|
||||||
vcpkg_configure_cmake(
|
vcpkg_configure_cmake(
|
||||||
SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public"
|
SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public"
|
||||||
PREFER_NINJA
|
PREFER_NINJA
|
||||||
|
@ -4534,7 +4534,7 @@
|
|||||||
},
|
},
|
||||||
"physx": {
|
"physx": {
|
||||||
"baseline": "4.1.1",
|
"baseline": "4.1.1",
|
||||||
"port-version": 6
|
"port-version": 7
|
||||||
},
|
},
|
||||||
"picojson": {
|
"picojson": {
|
||||||
"baseline": "1.3.0-1",
|
"baseline": "1.3.0-1",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "61c80fbae2a59a689ceb9774b288dc6ffbdceac4",
|
||||||
|
"version-string": "4.1.1",
|
||||||
|
"port-version": 7
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "ff229b023b059806554bb8d9e6fbc2b4eb0fe139",
|
"git-tree": "ff229b023b059806554bb8d9e6fbc2b4eb0fe139",
|
||||||
"version-string": "4.1.1",
|
"version-string": "4.1.1",
|
||||||
|
Loading…
Reference in New Issue
Block a user