Skip to content

Commit cbb53b2

Browse files
committedJul 11, 2022
8289952: Visual Studio libs msvcp140_1.dll and msvcp140_2.dll missing from build
Reviewed-by: arapte, sykora
1 parent 187fbe1 commit cbb53b2

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed
 

‎buildSrc/win.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ def vs2017DllPath = cygpath("${msvcRedstDir}/Microsoft.VC${windowsCRTVer}.CRT")
224224
if (file(vs2017DllPath).exists()) {
225225
ext.WIN.VS2017DLLNames = [
226226
"msvcp140.dll",
227+
"msvcp140_1.dll",
228+
"msvcp140_2.dll",
227229
"vcruntime140.dll",
228230
"vcruntime140_1.dll"
229231
];

‎modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,9 @@ public abstract class Toolkit {
157157
// Finally load VS 2017 DLLs in the following order
158158
"vcruntime140",
159159
"vcruntime140_1",
160-
"msvcp140"
160+
"msvcp140",
161+
"msvcp140_1",
162+
"msvcp140_2"
161163
};
162164

163165
private static String lookupToolkitClass(String name) {

0 commit comments

Comments
 (0)
Please sign in to comment.