WIP: build with either 2022 or 2026

Author: sheazywi

.gitignore

@@ -27,3 +27,4 @@ Core/vendor/GLAD
 Core/vendor/NFD-Extended
 Core/vendor/tracy
 Editor/SandboxProject/Assets/Scripts/Binaries
+Editor/Resources/Cache

scripts/Setup.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import subprocess
 import CheckPython
 
@@ -14,6 +15,56 @@
 
 colorama.init()
 
+
+def choose_visual_studio_generator():
+    options = ["vs2022", "vs2026"]
+
+    if len(sys.argv) > 1:
+        selected = sys.argv[1].lower().strip()
+        if selected in options:
+            return selected
+
+    try:
+        import msvcrt
+    except ImportError:
+        while True:
+            choice = input("Choose Visual Studio generator (vs2022/vs2026): ").strip().lower()
+            if choice in options:
+                return choice
+            print(f"{Fore.RED}Invalid choice. Please enter vs2022 or vs2026.{Style.RESET_ALL}")
+
+    selected_index = 0
+
+    def render_menu():
+        os.system("cls")
+        print(f"{Style.BRIGHT}{Back.GREEN}Choose Visual Studio generator{Style.RESET_ALL}")
+        print()
+        print("Use the arrow keys to move, then press Enter to confirm.")
+        print()
+
+        for index, option in enumerate(options):
+            prefix = ">" if index == selected_index else " "
+            if index == selected_index:
+                print(f"{Fore.CYAN}{Style.BRIGHT}{prefix} {option}{Style.RESET_ALL}")
+            else:
+                print(f"  {option}")
+
+    while True:
+        render_menu()
+        key = msvcrt.getch()
+
+        if key in (b"\r", b"\n"):
+            os.system("cls")
+            return options[selected_index]
+
+        if key in (b"\x00", b"\xe0"):
+            arrow = msvcrt.getch()
+            if arrow == b"H":  # Up
+                selected_index = (selected_index - 1) % len(options)
+            elif arrow == b"P":  # Down
+                selected_index = (selected_index + 1) % len(options)
+
+
 # Change from Scripts directory to root
 os.chdir('../')
 
@@ -25,7 +76,7 @@
 if (not Vulkan.CheckVulkanSDK()):
     print("Vulkan SDK not installed.")
     exit()
-    
+
 if (Vulkan.CheckVulkanSDKDebugLibs()):
     print(f"{Style.BRIGHT}{Back.GREEN}Vulkan SDK debug libs located.{Style.RESET_ALL}")
 
@@ -35,8 +86,10 @@
 if not os.path.exists("Editor/DotNet/"):
     os.makedirs("Editor/DotNet/")
 
-print(f"{Style.BRIGHT}{Back.GREEN}Generating Visual Studio 2022 solution.{Style.RESET_ALL}")
-subprocess.call(["vendor/bin/premake5.exe", "vs2022"])
+generator = choose_visual_studio_generator()
+
+print(f"{Style.BRIGHT}{Back.GREEN}Generating {generator} solution.{Style.RESET_ALL}")
+subprocess.call(["vendor/bin/premake5.exe", generator])
 
 os.chdir('Editor/SandboxProject')
-subprocess.call(["../../vendor/bin/premake5.exe", "vs2022"])
+subprocess.call(["../../vendor/bin/premake5.exe", generator])

scripts/Vulkan.py

@@ -16,9 +16,9 @@
 
 VULKAN_SDK = os.environ.get('VULKAN_SDK')
 LUX_REQUIRED_VULKAN_VERSION = '1.4.' # Any 1.3 version is fine
-LUX_INSTALL_VULKAN_VERSION = '1.3.216.0' # Specifically install this one if no 1.3 version is present
+LUX_INSTALL_VULKAN_VERSION = '1.4.341.1' # Specifically install this one if no 1.3 version is present
 VULKAN_SDK_INSTALLER_URL = f'https://sdk.lunarg.com/sdk/download/{LUX_INSTALL_VULKAN_VERSION}/windows/VulkanSDK-{LUX_INSTALL_VULKAN_VERSION}-Installer.exe'
-VULKAN_SDK_LOCAL_PATH = 'Lux/vendor/VulkanSDK'
+VULKAN_SDK_LOCAL_PATH = 'Core/vendor/VulkanSDK'
 VULKAN_SDK_EXE_PATH = f'{VULKAN_SDK_LOCAL_PATH}/VulkanSDK.exe'
 
 colorama.init()

scripts/Win-GenProjects.py

@@ -14,14 +14,39 @@
 
 colorama.init()
 
+
+def select_visual_studio_generator():
+    generators = {
+        "2022": "vs2022",
+        "2026": "vs2026"
+    }
+
+    while True:
+        choice = input(
+            f"{Style.BRIGHT}{Fore.CYAN}Which Visual Studio version do you want to generate? "
+            f"(2022/2026): {Style.RESET_ALL}"
+        ).strip()
+
+        if choice in generators:
+            return generators[choice]
+
+        print(
+            f"{Style.BRIGHT}{Fore.RED}Invalid choice. Please enter 2022 or 2026.{Style.RESET_ALL}"
+        )
+
+
 # Change from Scripts directory to root
 os.chdir('../')
 
 if not os.path.exists("Editor/DotNet/"):
     os.makedirs("Editor/DotNet/")
 
-print(f"{Style.BRIGHT}{Back.GREEN}Generating Visual Studio 2022 solution.{Style.RESET_ALL}")
-subprocess.call(["vendor/bin/premake5.exe", "vs2022"])
+selected_generator = select_visual_studio_generator()
+
+print(
+    f"{Style.BRIGHT}{Back.GREEN}Generating Visual Studio {selected_generator[2:]} solution.{Style.RESET_ALL}"
+)
+subprocess.call(["vendor/bin/premake5.exe", selected_generator])
 
 os.chdir('Editor/SandboxProject')
-subprocess.call(["../../vendor/bin/premake5.exe", "vs2022"])
+subprocess.call(["../../vendor/bin/premake5.exe", selected_generator])