From 0b574f6042b41b8350386d2d271b440f9c4e0759 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Sat, 25 Aug 2018 15:34:03 +0900 Subject: [PATCH] * Fix loading order of runtime libraries for Visual Studio 2015 on Windows (issue #606) --- CHANGELOG.md | 1 + hdf5/src/main/java/org/bytedeco/javacpp/presets/hdf5.java | 5 +++-- .../src/main/java/org/bytedeco/javacpp/freenect2.java | 4 ++-- .../main/java/org/bytedeco/javacpp/presets/freenect2.java | 5 +++-- .../src/main/java/org/bytedeco/javacpp/RealSense.java | 2 +- .../main/java/org/bytedeco/javacpp/presets/RealSense.java | 5 +++-- .../src/main/java/org/bytedeco/javacpp/presets/mklml.java | 7 ++++--- .../java/org/bytedeco/javacpp/presets/opencv_core.java | 5 +++-- .../main/java/org/bytedeco/javacpp/presets/tensorflow.java | 6 +++--- 9 files changed, 23 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 547ec70e095..d8adbd85fce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ + * Fix loading order of runtime libraries for Visual Studio 2015 on Windows ([issue #606](https://github.com/bytedeco/javacpp-presets/issues/606)) * Add methods overloaded with `PointerPointer` for MKL-DNN ([issue bytedeco/javacpp#251](https://github.com/bytedeco/javacpp/issues/251)) * Bundle native resources (header files and import libraries) of MKL-DNN * Make MSBuild compile more efficiently on multiple processors ([pull #599](https://github.com/bytedeco/javacpp-presets/pull/599)) diff --git a/hdf5/src/main/java/org/bytedeco/javacpp/presets/hdf5.java b/hdf5/src/main/java/org/bytedeco/javacpp/presets/hdf5.java index e45482cc895..a7a3017531d 100755 --- a/hdf5/src/main/java/org/bytedeco/javacpp/presets/hdf5.java +++ b/hdf5/src/main/java/org/bytedeco/javacpp/presets/hdf5.java @@ -47,10 +47,11 @@ "H5ArrayType.h", "H5VarLenType.h", "H5DataSet.h", "H5Group.h", "H5File.h", "H5Library.h"}, link = {"hdf5@.101", "hdf5_cpp@.102", "hdf5_hl@.100", "hdf5_hl_cpp@.100"}, resource = {"include", "lib"}), @Platform(value = "linux-ppc64le", link = {"hdf5@.101", "hdf5_cpp@.101", "hdf5_hl@.101", "hdf5_hl_cpp@.101"}), - @Platform(value = "windows", link = {"zlibstatic", "libhdf5", "libhdf5_cpp", "libhdf5_hl", "libhdf5_hl_cpp"}, preload = {"concrt140", "msvcp140", "vcruntime140", + @Platform(value = "windows", link = {"zlibstatic", "libhdf5", "libhdf5_cpp", "libhdf5_hl", "libhdf5_hl_cpp"}, preload = { "api-ms-win-crt-locale-l1-1-0", "api-ms-win-crt-string-l1-1-0", "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-math-l1-1-0", "api-ms-win-crt-heap-l1-1-0", "api-ms-win-crt-runtime-l1-1-0", "api-ms-win-crt-convert-l1-1-0", "api-ms-win-crt-environment-l1-1-0", - "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-filesystem-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "api-ms-win-crt-multibyte-l1-1-0"}), + "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-filesystem-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "api-ms-win-crt-multibyte-l1-1-0", + "vcruntime140", "msvcp140", "concrt140"}), @Platform(value = "windows-x86", preloadpath = {"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x86/Microsoft.VC140.CRT/", "C:/Program Files (x86)/Windows Kits/10/Redist/ucrt/DLLs/x86/"}), @Platform(value = "windows-x86_64", preloadpath = {"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x64/Microsoft.VC140.CRT/", diff --git a/libfreenect2/src/main/java/org/bytedeco/javacpp/freenect2.java b/libfreenect2/src/main/java/org/bytedeco/javacpp/freenect2.java index d94e2949e04..9bd10d74c80 100644 --- a/libfreenect2/src/main/java/org/bytedeco/javacpp/freenect2.java +++ b/libfreenect2/src/main/java/org/bytedeco/javacpp/freenect2.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; @@ -20,7 +20,7 @@ public class freenect2 extends org.bytedeco.javacpp.presets.freenect2 { public boolean empty() { return size() == 0; } public native long size(); - @Index(function = "at") public native Frame get(@Cast("libfreenect2::Frame::Type") int i); + @Index public native Frame get(@Cast("libfreenect2::Frame::Type") int i); public native FrameMap put(@Cast("libfreenect2::Frame::Type") int i, Frame value); public native @ByVal Iterator begin(); diff --git a/libfreenect2/src/main/java/org/bytedeco/javacpp/presets/freenect2.java b/libfreenect2/src/main/java/org/bytedeco/javacpp/presets/freenect2.java index 2aab296fc2a..58caa457180 100644 --- a/libfreenect2/src/main/java/org/bytedeco/javacpp/presets/freenect2.java +++ b/libfreenect2/src/main/java/org/bytedeco/javacpp/presets/freenect2.java @@ -37,10 +37,11 @@ "", "", ""}, link = "freenect2@.0.2"), @Platform(value = "macosx-x86_64", preload = "usb-1.0@.0", preloadpath = "/usr/local/lib/"), - @Platform(value = "windows-x86_64", preload = {"freenect2-openni2", "glfw3", "libusb-1.0", "turbojpeg", "concrt140", "msvcp140", "vcruntime140", + @Platform(value = "windows-x86_64", preload = { "api-ms-win-crt-locale-l1-1-0", "api-ms-win-crt-string-l1-1-0", "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-math-l1-1-0", "api-ms-win-crt-heap-l1-1-0", "api-ms-win-crt-runtime-l1-1-0", "api-ms-win-crt-convert-l1-1-0", "api-ms-win-crt-environment-l1-1-0", - "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-filesystem-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "api-ms-win-crt-multibyte-l1-1-0"}, + "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-filesystem-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "api-ms-win-crt-multibyte-l1-1-0", + "vcruntime140", "msvcp140", "concrt140", "libusb-1.0", "glfw3", "turbojpeg", "freenect2-openni2"}, preloadpath = {"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x64/Microsoft.VC140.CRT/", "C:/Program Files (x86)/Windows Kits/10/Redist/ucrt/DLLs/x64/"}) }) public class freenect2 implements InfoMapper { diff --git a/librealsense/src/main/java/org/bytedeco/javacpp/RealSense.java b/librealsense/src/main/java/org/bytedeco/javacpp/RealSense.java index d7844e88acc..53dcb2e504d 100644 --- a/librealsense/src/main/java/org/bytedeco/javacpp/RealSense.java +++ b/librealsense/src/main/java/org/bytedeco/javacpp/RealSense.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/librealsense/src/main/java/org/bytedeco/javacpp/presets/RealSense.java b/librealsense/src/main/java/org/bytedeco/javacpp/presets/RealSense.java index ea3117082d4..6280333dc91 100644 --- a/librealsense/src/main/java/org/bytedeco/javacpp/presets/RealSense.java +++ b/librealsense/src/main/java/org/bytedeco/javacpp/presets/RealSense.java @@ -41,10 +41,11 @@ include = {"", "", "", ""}, link = "realsense@.1"), @Platform(value = "macosx", preload = "usb-1.0@.0", preloadpath = "/usr/local/lib/"), - @Platform(value = "windows", preload = {"freenect2-openni2", "glfw3", "libusb-1.0", "turbojpeg", "concrt140", "msvcp140", "vcruntime140", + @Platform(value = "windows", preload = { "api-ms-win-crt-locale-l1-1-0", "api-ms-win-crt-string-l1-1-0", "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-math-l1-1-0", "api-ms-win-crt-heap-l1-1-0", "api-ms-win-crt-runtime-l1-1-0", "api-ms-win-crt-convert-l1-1-0", "api-ms-win-crt-environment-l1-1-0", - "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-filesystem-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "api-ms-win-crt-multibyte-l1-1-0"}), + "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-filesystem-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "api-ms-win-crt-multibyte-l1-1-0", + "vcruntime140", "msvcp140", "concrt140"}), @Platform(value = "windows-x86", preloadpath = {"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x86/Microsoft.VC140.CRT/", "C:/Program Files (x86)/Windows Kits/10/Redist/ucrt/DLLs/x86/"}), @Platform(value = "windows-x86_64", preloadpath = {"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x64/Microsoft.VC140.CRT/", diff --git a/mkl-dnn/src/main/java/org/bytedeco/javacpp/presets/mklml.java b/mkl-dnn/src/main/java/org/bytedeco/javacpp/presets/mklml.java index 6cb4c6030bf..d0177a2c55d 100644 --- a/mkl-dnn/src/main/java/org/bytedeco/javacpp/presets/mklml.java +++ b/mkl-dnn/src/main/java/org/bytedeco/javacpp/presets/mklml.java @@ -48,9 +48,10 @@ @Platform( value = "windows-x86_64", link = "mklml", - preload = {"msvcp140", "vcruntime140", "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-math-l1-1-0", - "api-ms-win-crt-heap-l1-1-0", "api-ms-win-crt-runtime-l1-1-0", "api-ms-win-crt-convert-l1-1-0", - "msvcr120", "libiomp5md"}, + preload = {"api-ms-win-crt-locale-l1-1-0", "api-ms-win-crt-string-l1-1-0", "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-math-l1-1-0", + "api-ms-win-crt-heap-l1-1-0", "api-ms-win-crt-runtime-l1-1-0", "api-ms-win-crt-convert-l1-1-0", "api-ms-win-crt-environment-l1-1-0", + "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-filesystem-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "api-ms-win-crt-multibyte-l1-1-0", + "msvcr120", "libiomp5md", "vcruntime140", "msvcp140", "concrt140"}, preloadpath = {"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x64/Microsoft.VC140.CRT/", "C:/Program Files (x86)/Windows Kits/10/Redist/ucrt/DLLs/x64/"})}, target = "org.bytedeco.javacpp.mklml") diff --git a/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_core.java b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_core.java index f3c2d9cb8ce..486d4b5171b 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_core.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_core.java @@ -61,10 +61,11 @@ @Platform(value = "linux-x86", preloadpath = {"/usr/lib32/", "/usr/lib/"}), @Platform(value = "linux-x86_64", preloadpath = {"/usr/lib64/", "/usr/lib/"}), @Platform(value = "linux-ppc64", preloadpath = {"/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}), - @Platform(value = "windows", define = "_WIN32_WINNT 0x0502", link = {"opencv_core342", "opencv_imgproc342"}, preload = {"concrt140", "msvcp140", "vcruntime140", + @Platform(value = "windows", define = "_WIN32_WINNT 0x0502", link = {"opencv_core342", "opencv_imgproc342"}, preload = { "api-ms-win-crt-locale-l1-1-0", "api-ms-win-crt-string-l1-1-0", "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-math-l1-1-0", "api-ms-win-crt-heap-l1-1-0", "api-ms-win-crt-runtime-l1-1-0", "api-ms-win-crt-convert-l1-1-0", "api-ms-win-crt-environment-l1-1-0", - "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-filesystem-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "api-ms-win-crt-multibyte-l1-1-0", "opencv_cudev342"}), + "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-filesystem-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "api-ms-win-crt-multibyte-l1-1-0", + "vcruntime140", "msvcp140", "concrt140", "opencv_cudev342"}), @Platform(value = "windows-x86", preloadpath = {"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x86/Microsoft.VC140.CRT/", "C:/Program Files (x86)/Windows Kits/10/Redist/ucrt/DLLs/x86/"}), @Platform(value = "windows-x86_64", preloadpath = {"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x64/Microsoft.VC140.CRT/", diff --git a/tensorflow/src/main/java/org/bytedeco/javacpp/presets/tensorflow.java b/tensorflow/src/main/java/org/bytedeco/javacpp/presets/tensorflow.java index ad5ba49987f..7167e44692c 100644 --- a/tensorflow/src/main/java/org/bytedeco/javacpp/presets/tensorflow.java +++ b/tensorflow/src/main/java/org/bytedeco/javacpp/presets/tensorflow.java @@ -196,10 +196,10 @@ link = {"Advapi32#", "double-conversion", "zlibstatic", "gpr", "grpc_unsecure", "grpc++_unsecure", "farmhash", "fft2d", "lmdb", "giflib", "libjpeg", "libpng16_static", "nsync", "libprotobuf", "re2", "snappy", "sqlite", "tensorflow_static", "tf_protos_cc", "tf_cc_op_gen_main", "tf_python_protos_cc", "tf_c_python_api"}, - preload = {"msvcr120", "libiomp5md", "mklml", "concrt140", "msvcp140", "vcruntime140", - "api-ms-win-crt-locale-l1-1-0", "api-ms-win-crt-string-l1-1-0", "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-math-l1-1-0", + preload = {"api-ms-win-crt-locale-l1-1-0", "api-ms-win-crt-string-l1-1-0", "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-math-l1-1-0", "api-ms-win-crt-heap-l1-1-0", "api-ms-win-crt-runtime-l1-1-0", "api-ms-win-crt-convert-l1-1-0", "api-ms-win-crt-environment-l1-1-0", - "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-filesystem-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "api-ms-win-crt-multibyte-l1-1-0"}), + "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-filesystem-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "api-ms-win-crt-multibyte-l1-1-0", + "msvcr120", "libiomp5md", "mklml", "vcruntime140", "msvcp140", "concrt140"}), @Platform( value = "windows-x86", preloadpath = {"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x86/Microsoft.VC140.CRT/",