From 6259feb9344689686b036c989adaad31777bd6d2 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 30 Nov 2016 00:05:36 +0100 Subject: [PATCH] Fix issue building against copy of Python that was compiled with MSVC 2010 --- makepanda/makepanda.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index b6d2cc1b8b..bade6c8288 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2951,9 +2951,12 @@ if GetTarget() == 'windows' and "VISUALSTUDIO" in SDK: crtname = "Microsoft.VC%s.CRT" % (vcver) dir = os.path.join(SDK["VISUALSTUDIO"], "VC", "redist", GetTargetArch(), crtname) - if os.path.isdir(dir): - CopyFile(GetOutputDir() + "/bin/", os.path.join(dir, "vcruntime" + vcver + ".dll")) + if os.path.isfile(os.path.join(dir, "msvcr" + vcver + ".dll")): + CopyFile(GetOutputDir() + "/bin/", os.path.join(dir, "msvcr" + vcver + ".dll")) + if os.path.isfile(os.path.join(dir, "msvcp" + vcver + ".dll")): CopyFile(GetOutputDir() + "/bin/", os.path.join(dir, "msvcp" + vcver + ".dll")) + if os.path.isfile(os.path.join(dir, "vcruntime" + vcver + ".dll")): + CopyFile(GetOutputDir() + "/bin/", os.path.join(dir, "vcruntime" + vcver + ".dll")) ######################################################################## ##