From f3e681c11c91ba974eb127761b21d4d1b12bd3be Mon Sep 17 00:00:00 2001
From: Brendan Shanks <bshanks@codeweavers.com>
Date: Tue, 19 Nov 2024 12:30:57 -0800
Subject: [PATCH] Taskfile: Put Linux/Mac/Unix vars in main Taskfile, and only
 override on Windows

---
 Taskfile.yml                      | 16 +++++++++++++++-
 scripts/tasks/Taskfile_darwin.yml | 12 ------------
 scripts/tasks/Taskfile_linux.yml  | 12 ------------
 3 files changed, 15 insertions(+), 25 deletions(-)
 delete mode 100644 scripts/tasks/Taskfile_darwin.yml
 delete mode 100644 scripts/tasks/Taskfile_linux.yml

diff --git a/Taskfile.yml b/Taskfile.yml
index 41e54ddf86f..62b722638c2 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -1,7 +1,21 @@
 version: 3
 
 includes:
-  build: ./scripts/tasks/Taskfile_{{OS}}.yml
+  build:
+    taskfile: ./scripts/tasks/Taskfile_{{OS}}.yml
+    optional: true
+
+# Default vars for Linux/Mac/Unix
+vars:
+  GOALC_BIN_RELEASE_DIR: './build/goalc'
+  GK_BIN_RELEASE_DIR: './build/game'
+  DECOMP_BIN_RELEASE_DIR: './build/decompiler'
+  MEMDUMP_BIN_RELEASE_DIR: './build/tools'
+  TYPESEARCH_BIN_RELEASE_DIR: './build/tools'
+  OFFLINETEST_BIN_RELEASE_DIR: './build'
+  GOALCTEST_BIN_RELEASE_DIR: './build'
+  FORMATTER_BIN_RELEASE_DIR: './build/tools'
+  EXE_FILE_EXTENSION: ''
 
 dotenv:
   - ./scripts/tasks/.env
diff --git a/scripts/tasks/Taskfile_darwin.yml b/scripts/tasks/Taskfile_darwin.yml
deleted file mode 100644
index 3ce6d2cab13..00000000000
--- a/scripts/tasks/Taskfile_darwin.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: 3
-
-vars:
-  GOALC_BIN_RELEASE_DIR: './build/goalc'
-  GK_BIN_RELEASE_DIR: './build/game'
-  DECOMP_BIN_RELEASE_DIR: './build/decompiler'
-  MEMDUMP_BIN_RELEASE_DIR: './build/tools'
-  TYPESEARCH_BIN_RELEASE_DIR: './build/tools'
-  OFFLINETEST_BIN_RELEASE_DIR: './build'
-  GOALCTEST_BIN_RELEASE_DIR: './build'
-  FORMATTER_BIN_RELEASE_DIR: './build/tools'
-  EXE_FILE_EXTENSION: ''
diff --git a/scripts/tasks/Taskfile_linux.yml b/scripts/tasks/Taskfile_linux.yml
deleted file mode 100644
index 3ce6d2cab13..00000000000
--- a/scripts/tasks/Taskfile_linux.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: 3
-
-vars:
-  GOALC_BIN_RELEASE_DIR: './build/goalc'
-  GK_BIN_RELEASE_DIR: './build/game'
-  DECOMP_BIN_RELEASE_DIR: './build/decompiler'
-  MEMDUMP_BIN_RELEASE_DIR: './build/tools'
-  TYPESEARCH_BIN_RELEASE_DIR: './build/tools'
-  OFFLINETEST_BIN_RELEASE_DIR: './build'
-  GOALCTEST_BIN_RELEASE_DIR: './build'
-  FORMATTER_BIN_RELEASE_DIR: './build/tools'
-  EXE_FILE_EXTENSION: ''