Skip to content

Commit bdc12f5

Browse files
committed
scip: Fix loading of libscip.dll in python and java on windows
1 parent 3c9748d commit bdc12f5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ortools/java/com/google/ortools/Loader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public static synchronized void loadNativeLibraries() {
143143
Path tempPath = unpackNativeResources(resourceURI);
144144
// libraries order does matter !
145145
List<String> dlls = Arrays.asList("zlib1", "abseil_dll", "re2", "utf8_validity",
146-
"libprotobuf", "highs", "scip", "ortools", "jniortools");
146+
"libprotobuf", "highs", "libscip", "ortools", "jniortools");
147147
for (String dll : dlls) {
148148
try {
149149
// System.out.println("System.load(" + dll + ")");

ortools/python/__init__.py.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def _load_ortools_libs():
5757
else:
5858
for dll in ["zlib1.dll",
5959
"abseil_dll.dll", "utf8_validity.dll", "re2.dll", "libprotobuf.dll",
60-
"highs.dll", "scip.dll",
60+
"highs.dll", "libscip.dll",
6161
"ortools.dll"]:
6262
dll_path = os.path.join(basedir, ".libs", dll)
6363
if os.path.exists(dll_path):

0 commit comments

Comments
 (0)