Преглед изворни кода

makepanda: Fix location of vulkan-1.lib in new Vulkan SDK on Windows

rdb пре 4 година
родитељ
комит
067a838d56
1 измењених фајлова са 4 додато и 1 уклоњено
  1. 4 1
      makepanda/makepanda.py

+ 4 - 1
makepanda/makepanda.py

@@ -590,7 +590,10 @@ if (COMPILER == "MSVC"):
                 IncDirectory(pkg, SDK[pkg]      + "/include")
                 IncDirectory(pkg, SDK[pkg]      + "/include")
             elif pkg == "VULKAN":
             elif pkg == "VULKAN":
                 IncDirectory(pkg, SDK[pkg] + "/Include")
                 IncDirectory(pkg, SDK[pkg] + "/Include")
-                LibName(pkg, SDK[pkg] + "/Source/lib/vulkan-1.lib")
+                if os.path.isfile(SDK[pkg] + "/Source/lib/vulkan-1.lib") and not os.path.isfile(SDK[pkg] + "/Lib/vulkan-1.lib"):
+                    LibName(pkg, SDK[pkg] + "/Source/lib/vulkan-1.lib")
+                else:
+                    LibName(pkg, SDK[pkg] + "/Lib/vulkan-1.lib")
             elif GetThirdpartyDir() is not None:
             elif GetThirdpartyDir() is not None:
                 IncDirectory(pkg, GetThirdpartyDir() + pkg.lower() + "/include")
                 IncDirectory(pkg, GetThirdpartyDir() + pkg.lower() + "/include")
     for pkg in DXVERSIONS:
     for pkg in DXVERSIONS: