From 1da5b4ceb7b28b07701053cdc79d2446aabbb842 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 1 Jan 2022 18:54:31 +0100 Subject: [PATCH] makepanda: Fix LocateLibrary to also work on Windows --- makepanda/makepandacore.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 7e4a86a2a9..5314e91da9 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1640,7 +1640,10 @@ def LocateLibrary(lib, lpath=[], prefer_static=False): return os.path.join(dir, 'lib%s.a' % lib) for dir in lpath: - if target == 'darwin' and os.path.isfile(os.path.join(dir, 'lib%s.dylib' % lib)): + if target == 'windows': + if os.path.isfile(os.path.join(dir, lib + '.lib')): + return os.path.join(dir, lib + '.lib') + elif target == 'darwin' and os.path.isfile(os.path.join(dir, 'lib%s.dylib' % lib)): return os.path.join(dir, 'lib%s.dylib' % lib) elif target != 'darwin' and os.path.isfile(os.path.join(dir, 'lib%s.so' % lib)): return os.path.join(dir, 'lib%s.so' % lib)