Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ode] Fix error C3861 #27450

Merged
merged 3 commits into from
Oct 26, 2022
Merged

[ode] Fix error C3861 #27450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb1fda7
[ode] Fix error C3861
LilyWangLL Oct 25, 2022
f434d33
x-add-version
LilyWangLL Oct 25, 2022
c6c9569
Fix broken homepage link and add tests.
BillyONeal Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions ports/ode/fix-error-C3861.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
6 changes: 5 additions & 1 deletion ports/ode/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 3 additions & 2 deletions ports/ode/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5314,7 +5314,7 @@
},
"ode": {
"baseline": "0.16.1",
"port-version": 3
"port-version": 4
},
"offscale-libetcd-cpp": {
"baseline": "2019-07-10",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/ode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "205b8fbadd2afe4fb17b6f161ead18ec7dd0e735",
"version": "0.16.1",
"port-version": 4
},
{
"git-tree": "8bc51447289df2b0693e433dace17ac0facbeba9",
"version": "0.16.1",
Expand Down