TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: look for vorbis library without _static suffix

Browse Source 
Fixes: #202
This commit is contained in:
rdb 2017-11-26 23:36:50 +01:00
parent 42f8978236
commit a1b5c6faa2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makepanda/makepanda.py
View File

@ -651,9 +651,11 @@ if (COMPILER == "MSVC"):
DefSymbol("WX", "_UNICODE", "") DefSymbol("WX", "_UNICODE", "")
DefSymbol("WX", "UNICODE", "") DefSymbol("WX", "UNICODE", "")
if (PkgSkip("VORBIS")==0): if (PkgSkip("VORBIS")==0):
LibName("VORBIS", GetThirdpartyDir() + "vorbis/lib/libogg_static.lib") for lib in ('ogg', 'vorbis', 'vorbisfile'):
LibName("VORBIS", GetThirdpartyDir() + "vorbis/lib/libvorbis_static.lib") path = GetThirdpartyDir() + "vorbis/lib/lib{0}_static.lib".format(lib)
LibName("VORBIS", GetThirdpartyDir() + "vorbis/lib/libvorbisfile_static.lib") if not os.path.isfile(path):
path = GetThirdpartyDir() + "vorbis/lib/{0}.lib".format(lib)
LibName("VORBIS", path)
for pkg in MAYAVERSIONS: for pkg in MAYAVERSIONS:
if (PkgSkip(pkg)==0): if (PkgSkip(pkg)==0):
LibName(pkg, '"' + SDK[pkg] + '/lib/Foundation.lib"') LibName(pkg, '"' + SDK[pkg] + '/lib/Foundation.lib"')