From eba6b7f776db545fcf5254bbe62ac06ea5273d52 Mon Sep 17 00:00:00 2001 From: HGuillemet Date: Sun, 19 May 2024 13:44:33 +0200 Subject: [PATCH] * Bundle `libomp` from Visual Studio to fix presets using OpenMP on Windows (pull #755) --- CHANGELOG.md | 1 + src/main/java/org/bytedeco/javacpp/presets/javacpp.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45120733e..0d04034a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ + * Bundle `libomp` from Visual Studio to fix presets using OpenMP on Windows ([pull #755](https://github.com/bytedeco/javacpp/pull/755)) * Fix inconsistencies when using `@Platform(inherit=..., library=...)` together ([pull #747](https://github.com/bytedeco/javacpp/pull/747)) * Let `Parser` support templates with unnamed type parameters ([pull #742](https://github.com/bytedeco/javacpp/pull/742)) * Prevent `Parser` from producing duplicate declarations for basic containers ([pull #741](https://github.com/bytedeco/javacpp/pull/741)) diff --git a/src/main/java/org/bytedeco/javacpp/presets/javacpp.java b/src/main/java/org/bytedeco/javacpp/presets/javacpp.java index c73850eaf..e53479c9e 100644 --- a/src/main/java/org/bytedeco/javacpp/presets/javacpp.java +++ b/src/main/java/org/bytedeco/javacpp/presets/javacpp.java @@ -50,7 +50,7 @@ "api-ms-win-core-sysinfo-l1-1-0", "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-console-l1-1-0", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-rtlsupport-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", "api-ms-win-core-file-l1-2-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-memory-l1-1-0", "api-ms-win-core-util-l1-1-0", "api-ms-win-core-interlocked-l1-1-0", "ucrtbase", - "vcruntime140", "vcruntime140_1", "msvcp140", "msvcp140_1", "concrt140", "vcomp140"} + "vcruntime140", "vcruntime140_1", "msvcp140", "msvcp140_1", "concrt140", "vcomp140", "libomp140.i386", "libomp140.x86_64"} ), @Platform( value = "windows-x86",