[physx] Update to 4.1.2 (#17453)

* [physx] Update to 4.1.2

* [physx] Update to vcpkg-cmake

* [physx] x-add-version

11 files changed, 119 insertions, 111 deletions

diff --git a/ports/physx/CONTROL b/ports/physx/CONTROL
deleted file mode 100644
index c35db5c1b..000000000
--- a/ports/physx/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: physx

-Version: 4.1.1

-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

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
diff --git a/ports/physx/fix_discarded_qualifiers.patch b/ports/physx/fix_discarded_qualifiers.patch
deleted file mode 100644
index b007e5635..000000000
--- a/ports/physx/fix_discarded_qualifiers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/physx/source/geomutils/src/gjk/GuGJKType.h b/physx/source/geomutils/src/gjk/GuGJKType.h

-index a0099e2f..b824ec7a 100644

---- a/physx/source/geomutils/src/gjk/GuGJKType.h

-+++ b/physx/source/geomutils/src/gjk/GuGJKType.h

-@@ -151,7 +151,7 @@ namespace Gu

- 

- 		virtual Ps::aos::Vec3V getCenter() const { return mAToB.transform(getConvex<Convex>().getCenter()); }

- 

--		PX_FORCE_INLINE Ps::aos::PsMatTransformV& getRelativeTransform(){ return mAToB; }

-+		PX_FORCE_INLINE const Ps::aos::PsMatTransformV& getRelativeTransform(){ return mAToB; }

- 

- 		//ML: we can't force inline function, otherwise win modern will throw compiler error

- 		PX_INLINE RelativeConvex<typename ConvexGeom<Convex>::Type > getGjkConvex() const

diff --git a/ports/physx/internalMBP_symbols.patch b/ports/physx/internalMBP_symbols.patch
deleted file mode 100644
index a74e2eaab..000000000
--- a/ports/physx/internalMBP_symbols.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.cpp b/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.cpp

-index f19ba271..51580049 100644

---- a/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.cpp

-+++ b/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.cpp

-@@ -90,6 +90,8 @@ using namespace Cm;

- 		return ir;

- 	}*/

- 

-+namespace internalMBP {

-+

- struct RegionHandle : public Ps::UserAllocated

- {

- 	PxU16	mHandle;			// Handle from region

-@@ -582,6 +584,10 @@ struct RegionData : public Ps::UserAllocated

- 	#endif

- #endif

- 

-+}

-+

-+using namespace internalMBP;

-+

- ///////////////////////////////////////////////////////////////////////////////

- 

- MBP_PairManager::MBP_PairManager() :

-diff --git a/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.h b/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.h

-index cf15f6d3..90f43e47 100644

---- a/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.h

-+++ b/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.h

-@@ -35,8 +35,10 @@

- #include "BpBroadPhaseMBPCommon.h"

- #include "BpMBPTasks.h"

- 

-+namespace internalMBP {

- 	class MBP;

--	

-+}

-+

- namespace physx

- {

- namespace Bp

-@@ -84,7 +86,7 @@ namespace Bp

- 				MBPUpdateWorkTask			mMBPUpdateWorkTask;

- 				MBPPostUpdateWorkTask		mMBPPostUpdateWorkTask;

- 

--				MBP*						mMBP;		// PT: TODO: aggregate

-+				internalMBP::MBP*			mMBP;		// PT: TODO: aggregate

- 

- 				MBP_Handle*					mMapping;

- 				PxU32						mCapacity;

diff --git a/ports/physx/msvc_142_bug_workaround.patch b/ports/physx/msvc_142_bug_workaround.patch
deleted file mode 100644
index 55433350d..000000000
--- a/ports/physx/msvc_142_bug_workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/physx/source/foundation/include/windows/PsWindowsInlineAoS.h b/physx/source/foundation/include/windows/PsWindowsInlineAoS.h

-index 881dffb..7111189 100644

---- a/physx/source/foundation/include/windows/PsWindowsInlineAoS.h

-+++ b/physx/source/foundation/include/windows/PsWindowsInlineAoS.h

-@@ -363,7 +363,7 @@

- PX_FORCE_INLINE Vec3V V3LoadA(const PxF32* const f)

- {

- 	ASSERT_ISALIGNED16(f);

--   return V4ClearW(_mm_load_ps(f));

-+   return [ & ](){ return V4ClearW(_mm_load_ps(f)); }(); // MSVC 142 bug workaround

- }

- 

- PX_FORCE_INLINE Vec3V V3LoadU(const PxF32* const i)

diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake
index 2d4d627fb..3b905cc01 100644
--- a/ports/physx/portfile.cmake
+++ b/ports/physx/portfile.cmake
@@ -3,15 +3,12 @@ vcpkg_fail_port_install(ON_TARGET MINGW)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO NVIDIAGameWorks/PhysX
-    REF ae80dede0546d652040ae6260a810e53e20a06fa
-    SHA512 f3a690039cf39fe2db9a728b82af0d39eaa02340a853bdad4b5152d63532367eb24fc7033a614882168049b80d803b6225fc60ed2900a9d0deab847f220540be
+    REF 93c6dd21b545605185f2febc8eeacebe49a99479
+    SHA512 c9f50255ca9e0f1ebdb9926992315a62b77e2eea3addd4e65217283490714e71e24f2f687717dd8eb155078a1a6b25c9fadc123ce8bc4c5615f7ac66cd6b11aa
     HEAD_REF master
     PATCHES
-        internalMBP_symbols.patch
-        msvc_142_bug_workaround.patch
-        vs16_3_typeinfo_header_fix.patch
-        fix_discarded_qualifiers.patch
         fix-compiler-flag.patch
+        remove-werror.patch
 )
 
 if(NOT DEFINED RELEASE_CONFIGURATION)
@@ -79,15 +76,14 @@ else()
     list(APPEND OPTIONS "-DPX_OUTPUT_ARCH=x86")
 endif()
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public"
-    PREFER_NINJA
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS ${OPTIONS}
     OPTIONS_DEBUG ${OPTIONS_DEBUG}
     OPTIONS_RELEASE ${OPTIONS_RELEASE}
 )
-vcpkg_install_cmake()
+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.
diff --git a/ports/physx/remove-werror.patch b/ports/physx/remove-werror.patch
new file mode 100644
index 000000000..94f802e0f
--- /dev/null
+++ b/ports/physx/remove-werror.patch
@@ -0,0 +1,66 @@
+diff --git a/physx/source/compiler/cmake/android/CMakeLists.txt b/physx/source/compiler/cmake/android/CMakeLists.txt
+index 06e0d98b..e6a77f17 100644
+--- a/physx/source/compiler/cmake/android/CMakeLists.txt
++++ b/physx/source/compiler/cmake/android/CMakeLists.txt
+@@ -33,15 +33,15 @@ STRING(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWERCASE)
+ SET(PHYSX_WARNING_DISABLES "-Wno-invalid-offsetof -Wno-maybe-uninitialized  -Wno-unused-variable -Wno-variadic-macros -Wno-array-bounds -Wno-strict-aliasing")
+ 
+ IF(${ANDROID_ABI} STREQUAL "armeabi-v7a")
+-	SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
++	SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
+ ELSEIF(${ANDROID_ABI} STREQUAL "armeabi-v7a with NEON")
+-	SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
++	SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
+ ELSEIF(${ANDROID_ABI} STREQUAL "arm64-v8a")
+-	SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} " CACHE INTERNAL "PhysX CXX")
++	SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} " CACHE INTERNAL "PhysX CXX")
+ ELSEIF(${ANDROID_ABI} STREQUAL "x86")
+-	SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -fpack-struct=8 -malign-double " CACHE INTERNAL "PhysX CXX")
++	SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -fpack-struct=8 -malign-double " CACHE INTERNAL "PhysX CXX")
+ ELSEIF(${ANDROID_ABI} STREQUAL "x86_64")
+-	SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -mstackrealign -msse3 " CACHE INTERNAL "PhysX CXX")
++	SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -mstackrealign -msse3 " CACHE INTERNAL "PhysX CXX")
+ ENDIF()
+ 
+ # Build debug info for all configurations
+diff --git a/physx/source/compiler/cmake/ios/CMakeLists.txt b/physx/source/compiler/cmake/ios/CMakeLists.txt
+index 5605e9af..3d2fe6f0 100644
+--- a/physx/source/compiler/cmake/ios/CMakeLists.txt
++++ b/physx/source/compiler/cmake/ios/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ ## Copyright (c) 2008-2021 NVIDIA Corporation. All rights reserved.
+ 
+ 
+-SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -ferror-limit=0 -Wall -Wextra -Werror -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX")
++SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX")
+ 
+ SET(CMAKE_SHARED_LINKER_FLAGS_CHECKED "")
+ SET(CMAKE_SHARED_LINKER_FLAGS_PROFILE "")
+diff --git a/physx/source/compiler/cmake/linux/CMakeLists.txt b/physx/source/compiler/cmake/linux/CMakeLists.txt
+index aba53365..6246e488 100644
+--- a/physx/source/compiler/cmake/linux/CMakeLists.txt
++++ b/physx/source/compiler/cmake/linux/CMakeLists.txt
+@@ -28,8 +28,8 @@
+ STRING(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWERCASE)
+ 
+ #TODO: Fix warnings
+-SET(CLANG_WARNINGS "-ferror-limit=0 -Wall -Wextra -Werror -Wno-alloca -Wno-anon-enum-enum-conversion -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-gnu-anonymous-struct -Wno-undef -Wno-unused-function -Wno-nested-anon-types -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-format-nonliteral -Wno-implicit-fallthrough -Wno-undefined-reinterpret-cast -Wno-disabled-macro-expansion -Wno-zero-as-null-pointer-constant -Wno-shadow -Wno-unknown-warning-option -Wno-atomic-implicit-seq-cst -Wno-extra-semi-stmt")
+-SET(GCC_WARNINGS "-Wall -Werror -Wno-invalid-offsetof -Wno-uninitialized")
++SET(CLANG_WARNINGS "-ferror-limit=0 -Wall -Wextra -Wno-alloca -Wno-anon-enum-enum-conversion -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-gnu-anonymous-struct -Wno-undef -Wno-unused-function -Wno-nested-anon-types -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-format-nonliteral -Wno-implicit-fallthrough -Wno-undefined-reinterpret-cast -Wno-disabled-macro-expansion -Wno-zero-as-null-pointer-constant -Wno-shadow -Wno-unknown-warning-option -Wno-atomic-implicit-seq-cst -Wno-extra-semi-stmt")
++SET(GCC_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-uninitialized")
+ 
+ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ 	# using Clang	  
+diff --git a/physx/source/compiler/cmake/mac/CMakeLists.txt b/physx/source/compiler/cmake/mac/CMakeLists.txt
+index 36799700..97cb4c7f 100644
+--- a/physx/source/compiler/cmake/mac/CMakeLists.txt
++++ b/physx/source/compiler/cmake/mac/CMakeLists.txt
+@@ -28,7 +28,7 @@
+ SET(OSX_BITNESS "-arch x86_64")
+ SET(CMAKE_OSX_ARCHITECTURES "x86_64")
+ 
+-SET(PHYSX_CXX_FLAGS "${OSX_BITNESS} -msse2 -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX")
++SET(PHYSX_CXX_FLAGS "${OSX_BITNESS} -msse2 -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX")
+ 
+ SET(CMAKE_SHARED_LINKER_FLAGS_CHECKED "")
+ SET(CMAKE_SHARED_LINKER_FLAGS_PROFILE "")
diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json
new file mode 100644
index 000000000..1a93f3f51
--- /dev/null
+++ b/ports/physx/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "physx",
+  "version-semver": "4.1.2",
+  "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",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/physx/vs16_3_typeinfo_header_fix.patch b/ports/physx/vs16_3_typeinfo_header_fix.patch
deleted file mode 100644
index 8c2a5a01a..000000000
--- a/ports/physx/vs16_3_typeinfo_header_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/physx/source/foundation/include/PsAllocator.h b/physx/source/foundation/include/PsAllocator.h

---- a/physx/source/foundation/include/PsAllocator.h

-+++ b/physx/source/foundation/include/PsAllocator.h

-@@ -37,7 +37,7 @@

- 

- #if(PX_WINDOWS_FAMILY || PX_XBOXONE)

- 	#include <exception>

--	#include <typeinfo.h>

-+	#include <typeinfo>

- #endif

- #if(PX_APPLE_FAMILY)

- 	#include <typeinfo>

diff --git a/versions/baseline.json b/versions/baseline.json
index 5c77099ed..a9c433a00 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4737,8 +4737,8 @@
       "port-version": 4
     },
     "physx": {
-      "baseline": "4.1.1",
-      "port-version": 7
+      "baseline": "4.1.2",
+      "port-version": 0
     },
     "picojson": {
       "baseline": "1.3.0-1",
diff --git a/versions/p-/physx.json b/versions/p-/physx.json
index c69b0eada..4d5ac929d 100644
--- a/versions/p-/physx.json
+++ b/versions/p-/physx.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "c2731461cec1f38b720c3db1038e3096957244a4",
+      "version-semver": "4.1.2",
+      "port-version": 0
+    },
+    {
       "git-tree": "61c80fbae2a59a689ceb9774b288dc6ffbdceac4",
       "version-string": "4.1.1",
       "port-version": 7