Browse Source

use target arch to locate sdks dir on windows

rdb 13 năm trước cách đây
mục cha
commit
4bf17ae286
1 tập tin đã thay đổi với 8 bổ sung5 xóa
  1. 8 5
      makepanda/makepandacore.py

+ 8 - 5
makepanda/makepandacore.py

@@ -1561,13 +1561,16 @@ def GetSdkDir(sdkname, sdkkey = None):
 
 
     sdir = sdkbase[:]
     sdir = sdkbase[:]
     target = GetTarget()
     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 += "/linux"
         sdir += platform.architecture()[0][:2]
         sdir += platform.architecture()[0][:2]
-    elif (target == 'darwin'):
+    elif target == 'darwin':
         sdir += "/macosx"
         sdir += "/macosx"
     sdir += "/" + sdkname
     sdir += "/" + sdkname