TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: Fix LocateLibrary to also work on Windows

Browse Source
This commit is contained in:
rdb 2022-01-01 18:54:31 +01:00
parent e9c97535f7
commit 1da5b4ceb7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makepanda/makepandacore.py
View File

@ -1640,7 +1640,10 @@ def LocateLibrary(lib, lpath=[], prefer_static=False):
return os.path.join(dir, 'lib%s.a' % lib) return os.path.join(dir, 'lib%s.a' % lib)
for dir in lpath: 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) return os.path.join(dir, 'lib%s.dylib' % lib)
elif target != 'darwin' and os.path.isfile(os.path.join(dir, 'lib%s.so' % 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) return os.path.join(dir, 'lib%s.so' % lib)