[ode] Fix error C3861 (#27450)

* [ode] Fix error C3861
microsoft · Oct 26, 2022 · 043338a · 043338a
1 parent ee3980f
commit 043338a
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 4 deletions.
diff --git a/ports/ode/fix-error-C3861.patch b/ports/ode/fix-error-C3861.patch
@@ -0,0 +1,20 @@
+diff --git a/ou/include/ou/atomic.h b/ou/include/ou/atomic.h
+index 2f90a70..33e0ab9 100644
+--- a/ou/include/ou/atomic.h
++++ b/ou/include/ou/atomic.h
+@@ -397,6 +397,7 @@ END_NAMESPACE_OU();
+
+ #include <windows.h>
+ #include <stddef.h>
++#include <intrin.h>
+
+
+ BEGIN_NAMESPACE_OU();
+@@ -574,7 +575,6 @@ static _OU_ALWAYSINLINE bool _OU_CONVENTION_API
+
+ #define __OU_ATOMIC_READREORDERBARRIER_FUNCTION_DEFINED
+
+-#include <intrin.h>
+
+ static _OU_ALWAYSINLINE void _OU_CONVENTION_API 
+ /*void */AtomicReadReorderBarrier()
diff --git a/ports/ode/portfile.cmake b/ports/ode/portfile.cmake
@@ -4,11 +4,15 @@ vcpkg_from_bitbucket(
     REF 0.16.1
     SHA512 04429cae1b8fc703e53880c5de78293cee46fe4855c96ca7006bd5848255a0df004b75716a6b30ff5176df004e2bec29b2a31d4af8e7ac59da18f0af2eed8396
     HEAD_REF master
+    PATCHES
+        fix-error-C3861.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS -DODE_WITH_DEMOS=0 -DODE_WITH_TESTS=0
+    OPTIONS
+        -DODE_WITH_DEMOS=0
+        -DODE_WITH_TESTS=0
 )
 
 vcpkg_cmake_install()

diff --git a/ports/ode/vcpkg.json b/ports/ode/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "ode",
   "version": "0.16.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Open Dynamics Engine",
-  "homepage": "https://bitbucket.org/odedevs/ode/src/default/",
+  "homepage": "https://bitbucket.org/odedevs/ode/src/master/",
+  "license": "BSD-3-Clause OR LGPL-2.1-or-later",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5314,7 +5314,7 @@
     },
     "ode": {
       "baseline": "0.16.1",
-      "port-version": 3
+      "port-version": 4
     },
     "offscale-libetcd-cpp": {
       "baseline": "2019-07-10",

diff --git a/versions/o-/ode.json b/versions/o-/ode.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "205b8fbadd2afe4fb17b6f161ead18ec7dd0e735",
+      "version": "0.16.1",
+      "port-version": 4
+    },
     {
       "git-tree": "8bc51447289df2b0693e433dace17ac0facbeba9",
       "version": "0.16.1",