Cleanup of Windows build scripts

dbeef · Jun 16, 2024 · a93f685 · a93f685
1 parent d033437
commit a93f685
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/scripts/windows/TODO.txt b/scripts/windows/TODO.txt
diff --git a/scripts/windows/config.ps1 b/scripts/windows/config.ps1
@@ -1,22 +1,15 @@
-[CmdletBinding()]
-param (
-    [Parameter()][String]
-    $DepsDirectory="deps"
-)
-
 $ErrorActionPreference = "Stop"
 
-$ROOT = $(Get-Location)/../../
-$INSTALL_PATH = "$ROOT/tmp/install-windows"
-$DEPS_PATH = "$ROOT/$DepsDirectory/SDL"
+$ROOT_PATH = "$(Get-Location)/../../"
+$TMP_PATH = "$ROOT_PATH/tmp"
+$DEPS_PATH = "$TMP_PATH/deps-windows/SDL"
+$INSTALL_PATH = "$TMP_PATH/install-windows"
+$BUILD_PATH = "$TMP_PATH/build-windows"
 
-if (Test-Path "$ROOT/tmp/build-windows")
-{
-    Remove-Item -Force -Recurse "$ROOT/tmp/build-windows"
-}
-New-Item -Path "$ROOT/tmp/build-windows" -ItemType "Directory"
+New-Item -Path "$BUILD_PATH" -ItemType "Directory"
 
-cmake $ROOT `
-    -B"$ROOT/tmp/build-windows" `
+cmake `
+    -S $ROOT_PATH `
+    -B "$BUILD_PATH" `
     -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" `
     -DCMAKE_PREFIX_PATH="$DEPS_PATH"
diff --git a/scripts/windows/dependencies-install.ps1 b/scripts/windows/dependencies-install.ps1
@@ -7,7 +7,7 @@ param (
     $SDLMixerVersion="1.2.12",
 
     [Parameter()][String]
-    $DepsDirectory="deps"
+    $DepsDirectory="../../tmp/deps-windows"
 )
 
 $ErrorActionPreference = "Stop"