From 4bf17ae286b63513b3b86170229cba2ae5360eba Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 9 Feb 2013 11:43:14 +0000 Subject: [PATCH] use target arch to locate sdks dir on windows --- makepanda/makepandacore.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 74dcd6e068..fa31c09eb0 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1561,13 +1561,16 @@ def GetSdkDir(sdkname, sdkkey = None): sdir = sdkbase[:] target = GetTarget() - if (target == 'windows'): - sdir += "/win" - sdir += platform.architecture()[0][:2] - elif (target == 'linux'): + target_arch = GetTargetArch() + if target == 'windows': + if target_arch == 'x64': + sdir += "/win64" + else: + sdir += "/win32" + elif target == 'linux': sdir += "/linux" sdir += platform.architecture()[0][:2] - elif (target == 'darwin'): + elif target == 'darwin': sdir += "/macosx" sdir += "/" + sdkname