additions

Signed-off-by: Eddie James <eajames@martyr.games>
eddiejames · Jul 20, 2022 · 4202900 · 4202900
1 parent 8ff1682
commit 4202900
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/ports/gamenetworkingsockets/portfile.cmake b/ports/gamenetworkingsockets/portfile.cmake
@@ -1,14 +1,15 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ValveSoftware/GameNetworkingSockets
-    REF 505c697d0abef5da2ff3be35aa4ea3687597c3e9 # v1.4.1
-    SHA512 3e4b4da138f2b356169e6504aa899c9eca4fba5b5fcaed2a0ae8a2f5828976dd00af9f3262c75bd6d820300da87ebe32da152fecddc278a651f3b33eb59142df
+    REF f83a17416b20ca8815c88385149c566f291e9d76 # v1.4.1
+    SHA512 ff5e03762c196a6715e57a17b05a2d9fd59cc4305d14327a974db4df33cb952c801cfaa782a2675716f2801452666a7287ec95051a24b3bb89459a847f4d6e26
     HEAD_REF master
 )
 
 set(CRYPTO_BACKEND OpenSSL)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIB)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB)
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_CRT_STATIC)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -18,6 +19,12 @@ vcpkg_cmake_configure(
         -DBUILD_TOOLS=OFF
         -DUSE_CRYPTO=${CRYPTO_BACKEND}
         -DUSE_CRYPTO25519=${CRYPTO_BACKEND}
+        -DBUILD_STATIC_LIB=${BUILD_STATIC_LIB}
+        -DBUILD_SHARED_LIB=${BUILD_SHARED_LIB}
+        -DMSVC_CRT_STATIC=${MSVC_CRT_STATIC}
+        ${FEATURE_OPTIONS}
+    MAYBE_UNUSED_VARIABLES
+        MSVC_CRT_STATIC
 )
 
 vcpkg_cmake_install()

diff --git a/ports/gamenetworkingsockets/vcpkg.json b/ports/gamenetworkingsockets/vcpkg.json
@@ -4,7 +4,7 @@
   "description": "GameNetworkingSockets is a basic transport layer for games.",
   "homepage": "https://github.com/ValveSoftware/GameNetworkingSockets",
   "license": "BSD-3-Clause",
-  "supports": "!(static & windows) & !uwp & !(arm64 & windows)",
+  "supports": "!uwp & !(arm64 & windows)",
   "dependencies": [
     "openssl",
     "protobuf",

diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake
@@ -149,6 +149,25 @@ else()
     endforeach()
 endif()
 
+file(GLOB PHYSX_SRC_HDRS ${SOURCE_PATH}/physx/source/common/src/*.h)
+file(INSTALL ${PHYSX_SRC_HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(GLOB PHYSX_SRC_HDRS ${SOURCE_PATH}/physx/source/foundation/include/*.h)
+file(INSTALL ${PHYSX_SRC_HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(GLOB PHYSX_SRC_HDRS ${SOURCE_PATH}/physx/source/foundation/include/unix/*.h)
+file(INSTALL ${PHYSX_SRC_HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/unix)
+file(GLOB PHYSX_SRC_HDRS ${SOURCE_PATH}/physx/source/foundation/include/windows/*.h)
+file(INSTALL ${PHYSX_SRC_HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/windows)
+file(GLOB PHYSX_SRC_HDRS ${SOURCE_PATH}/physx/source/physxextensions/src/*.h)
+file(INSTALL ${PHYSX_SRC_HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(GLOB PHYSX_SRC_HDRS ${SOURCE_PATH}/physx/source/physxextensions/src/serialization/*.h)
+file(INSTALL ${PHYSX_SRC_HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/serialization)
+file(GLOB ${SOURCE_PATH}/physx/source/physxextensions/src/serialization/Binary/*.h)
+file(INSTALL ${PHYSX_SRC_HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/serialization/Binary)
+file(GLOB PHYSX_SRC_HDRS ${SOURCE_PATH}/physx/source/physxextensions/src/serialization/File/*.h)
+file(INSTALL ${PHYSX_SRC_HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/serialization/File)
+file(GLOB PHYSX_SRC_HDRS ${SOURCE_PATH}/physx/source/physxextensions/src/serialization/Xml/*.h)
+file(INSTALL ${PHYSX_SRC_HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/serialization/Xml)
+
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/source"