From 62781c154b97ea57a2b39c98d4ca0d28e29ed404 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 30 Dec 2018 20:09:57 +0100 Subject: [PATCH] makepanda: fix instructions to find Opus thirdparty pkg on Windows --- makepanda/makepanda.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index f4f3da2357..40febe3cd0 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -808,9 +808,12 @@ if (COMPILER == "MSVC"): 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") - LibName("OPUS", GetThirdpartyDir() + "opus/lib/libopusfile_static.lib") + IncDirectory("OPUS", GetThirdpartyDir() + "opus/include/opus") + for lib in ('ogg', 'opus', 'opusfile'): + path = GetThirdpartyDir() + "opus/lib/lib{0}_static.lib".format(lib) + if not os.path.isfile(path): + path = GetThirdpartyDir() + "opus/lib/{0}.lib".format(lib) + LibName("OPUS", path) for pkg in MAYAVERSIONS: if (PkgSkip(pkg)==0): LibName(pkg, '"' + SDK[pkg] + '/lib/Foundation.lib"')