From 567463eab38a0f9eeb3eccdc8665dab07af732f6 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 26 Nov 2017 23:36:50 +0100 Subject: [PATCH] makepanda: look for vorbis library without _static suffix Fixes: #202 --- makepanda/makepanda.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 1f3c93ad3c..75e4ecfe45 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -705,9 +705,11 @@ if (COMPILER == "MSVC"): DefSymbol("WX", "_UNICODE", "") DefSymbol("WX", "UNICODE", "") if (PkgSkip("VORBIS")==0): - LibName("VORBIS", GetThirdpartyDir() + "vorbis/lib/libogg_static.lib") - LibName("VORBIS", GetThirdpartyDir() + "vorbis/lib/libvorbis_static.lib") - LibName("VORBIS", GetThirdpartyDir() + "vorbis/lib/libvorbisfile_static.lib") + for lib in ('ogg', 'vorbis', 'vorbisfile'): + path = GetThirdpartyDir() + "vorbis/lib/lib{0}_static.lib".format(lib) + if not os.path.isfile(path): + path = GetThirdpartyDir() + "vorbis/lib/{0}.lib".format(lib) + LibName("VORBIS", path) if (PkgSkip("OPUS")==0): LibName("OPUS", GetThirdpartyDir() + "opus/lib/libogg_static.lib") LibName("OPUS", GetThirdpartyDir() + "opus/lib/libopus_static.lib")