From 1bbfc1d9f6b51b1f32cc16460f40522196d01c14 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 6 Dec 2015 15:16:48 +0100 Subject: [PATCH] Put .lib files for .pyd modules in built/lib, so they are packaged into the SDK --- makepanda/makepanda.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index e3d4477ab8..a055f7e083 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1498,7 +1498,7 @@ def CompileLink(dll, obj, opts): if subsystem: cmd += " /SUBSYSTEM:" + subsystem - if dll.endswith(".dll"): + if dll.endswith(".dll") or dll.endswith(".pyd"): cmd += ' /IMPLIB:' + GetOutputDir() + '/lib/' + os.path.splitext(os.path.basename(dll))[0] + ".lib" for (opt, dir) in LIBDIRECTORIES: @@ -1506,10 +1506,8 @@ def CompileLink(dll, obj, opts): cmd += ' /LIBPATH:' + BracketNameWithQuotes(dir) for x in obj: - if x.endswith(".dll"): + if x.endswith(".dll") or x.endswith(".pyd"): cmd += ' ' + GetOutputDir() + '/lib/' + os.path.splitext(os.path.basename(x))[0] + ".lib" - elif x.endswith(".pyd"): - cmd += ' ' + os.path.splitext(x)[0] + ".lib" elif x.endswith(".lib"): dname = os.path.splitext(os.path.basename(x))[0] + ".dll" if (GetOrigExt(x) != ".ilb" and os.path.exists(GetOutputDir()+"/bin/" + dname)): @@ -1566,10 +1564,8 @@ def CompileLink(dll, obj, opts): cmd += ' /LIBPATH:' + BracketNameWithQuotes(dir) for x in obj: - if x.endswith(".dll"): + if x.endswith(".dll") or x.endswith(".pyd"): cmd += ' ' + GetOutputDir() + '/lib/' + os.path.splitext(os.path.basename(x))[0] + ".lib" - elif x.endswith(".pyd"): - cmd += ' ' + os.path.splitext(x)[0] + ".lib" elif x.endswith(".lib"): dname = os.path.splitext(dll)[0]+".dll" if (GetOrigExt(x) != ".ilb" and os.path.exists(GetOutputDir()+"/bin/" + os.path.splitext(os.path.basename(x))[0] + ".dll")):