From ad187b29f826b80dd5b331a5283d43ee8f277911 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 2 Mar 2022 10:01:57 +0100 Subject: [PATCH] makepanda: Force choose correct extension suffix for Windows Even when cross-compiling for 32-bit using a 64-bit copy of Python, and vice versa --- makepanda/makepandacore.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 0b7225432e..405ce75fc0 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -3489,11 +3489,17 @@ def SetOrigExt(x, v): ORIG_EXT[x] = v def GetExtensionSuffix(): - if sys.version_info >= (3, 0): + target = GetTarget() + + if sys.version_info >= (3, 5) and target == 'windows': + if GetTargetArch() == 'x64': + return '.cp%d%d-win_amd64.pyd' % (sys.version_info[:2]) + else: + return '.cp%d%d-win32.pyd' % (sys.version_info[:2]) + elif sys.version_info >= (3, 0): import _imp return _imp.extension_suffixes()[0] - target = GetTarget() if target == 'windows': return '.pyd' else: