From ea06e76a2f850e397d4f26c9d1d54e4b27533105 Mon Sep 17 00:00:00 2001
From: Daniel Craig <18090217+RanXacT@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:48:27 -0400
Subject: [PATCH] Fixes for GenerateSolutions.bat

* Set CWD. running `.\build\GenerateSolutions.bat` would fail.
* Fix submodule initialization. This was wrong.
* Only run VK setup if VK is installed.
* Prefer pushd/popd vs cd to ensure parent command prompt is returned to its original location on
error.
---
 build/GenerateSolutions.bat | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/build/GenerateSolutions.bat b/build/GenerateSolutions.bat
index 62850e7..0569253 100644
--- a/build/GenerateSolutions.bat
+++ b/build/GenerateSolutions.bat
@@ -1,6 +1,10 @@
 @echo off
 setlocal enabledelayedexpansion
 
+:: Ensure a consistent working directory location. 
+:: All referenced paths are relative to this.
+pushd %~dp0
+
 echo Checking pre-requisites... 
 
 :: Check if CMake is installed
@@ -16,12 +20,11 @@ if %errorlevel% NEQ 0 (
 if not exist ..\libs\cauldron\common.cmake (
     echo File: common.cmake  doesn't exist in '.\libs\cauldron\'  -  Initializing submodule... 
 
-    :: attempt to initialize submodule
-    cd ..
+    :: attempt to initialize submodules
+    pushd ..
     echo.
-    git submodule sync --recursive
     git submodule update --init --recursive
-    cd build 
+    popd
 
 
     :: check if submodule initialized properly
@@ -39,20 +42,24 @@ if not exist ..\libs\cauldron\common.cmake (
     echo    Cauldron   - Ready.
 )
 
+:: Call CMake
+mkdir DX12
+pushd DX12
+cmake -A x64 ..\.. -DGFX_API=DX12
+popd
+
+
 :: Check if VULKAN_SDK is installed but don't bail out
 if "%VULKAN_SDK%"=="" (
     echo Vulkan SDK is not installed -Environment variable VULKAN_SDK is not defined- : Please install the latest Vulkan SDK from LunarG.
 ) else (
     echo    Vulkan SDK - Ready : %VULKAN_SDK%
+
+    mkdir VK
+    pushd VK
+    cmake -A x64 ..\.. -DGFX_API=VK
+    popd
 )
 
-:: Call CMake
-mkdir DX12
-cd DX12
-cmake -A x64 ..\.. -DGFX_API=DX12
-cd ..
 
-mkdir VK
-cd VK
-cmake -A x64 ..\.. -DGFX_API=VK
-cd ..
+popd