diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2021-04-28 18:52:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 15:52:34 -0700 |
| commit | 59ea102312180ae2972e0bb47cef2cfce407b407 (patch) | |
| tree | fd9bf1f8f8ddb5104e250e5fa9d603c50dfb686d /ports/physx/fix-compiler-flag.patch | |
| parent | b9a6b3985ff9e84a28e4280b673298fedf8f2c17 (diff) | |
| download | vcpkg-59ea102312180ae2972e0bb47cef2cfce407b407.tar.gz vcpkg-59ea102312180ae2972e0bb47cef2cfce407b407.zip | |
[physx] Update to 4.1.2 (#17453)
* [physx] Update to 4.1.2
* [physx] Update to vcpkg-cmake
* [physx] x-add-version
Diffstat (limited to 'ports/physx/fix-compiler-flag.patch')
| -rw-r--r-- | ports/physx/fix-compiler-flag.patch | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/ports/physx/fix-compiler-flag.patch b/ports/physx/fix-compiler-flag.patch index 9178e4f29..cfb253e7e 100644 --- a/ports/physx/fix-compiler-flag.patch +++ b/ports/physx/fix-compiler-flag.patch @@ -1,5 +1,5 @@ diff --git a/physx/compiler/public/CMakeLists.txt b/physx/compiler/public/CMakeLists.txt -index bd85eee..f32fe82 100644 +index 77776ca7..bd7b496d 100644 --- a/physx/compiler/public/CMakeLists.txt +++ b/physx/compiler/public/CMakeLists.txt @@ -33,6 +33,8 @@ ENDIF() @@ -11,11 +11,30 @@ index bd85eee..f32fe82 100644 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 c772333..e8a243c 100644 +index a1ab3596..dbd20fb0 100644 --- a/physx/source/compiler/cmake/windows/CMakeLists.txt +++ b/physx/source/compiler/cmake/windows/CMakeLists.txt -@@ -41,15 +41,17 @@ ELSE() +@@ -41,17 +41,19 @@ ELSE() SET(PHYSX_FP_MODE "/fp:fast") ENDIF() IF(CMAKE_CL_64) @@ -23,14 +42,16 @@ index c772333..e8a243c 100644 + 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") ++ SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} /arch:SSE2 ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") ENDIF() -+if (0) ++if(FALSE) 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") + # 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 |