From eaca91f743e92cc5d258996b537cdb28db79ad4a Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Thu, 23 Nov 2023 13:05:08 +0100
Subject: [PATCH] Fix building Godot via build.py

---
 Tools/build.py                   | 19 +++++++------------
 Tools/build_and_publish_steam.py |  1 -
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Tools/build.py b/Tools/build.py
index ee3dbac8..2521f9c6 100755
--- a/Tools/build.py
+++ b/Tools/build.py
@@ -46,16 +46,18 @@ def execute(
     # temporary files in the build directory.
     clean_build_dir(build_config.build_folder)
 
-    # Build Godot Wallpaper
-    # Note: This must happen before building ScreenPlay!
-    if platform.system() == "Windows" and build_config.build_godot == "ON":
-        build_godot.build_godot(str(build_config.bin_dir), build_config.build_type)
-
     # Runs cmake configure and cmake build
     step_time = time.time()
     build_result = build(build_config, build_result)
     build_duration = time.time() - step_time
     print(f"⏱️ build_duration: {build_duration}s")
+    
+    
+    # Build Godot Wallpaper
+    # Note: This must happen after building ScreenPlay!
+    if platform.system() == "Windows":
+        build_godot.build_godot(str(build_config.bin_dir), build_config.build_type)
+
 
     # Copies all needed libraries and assets into the bin folder
     step_time = time.time()
@@ -181,7 +183,6 @@ def build(build_config: BuildConfig, build_result: BuildResult) -> BuildResult:
 	-DSCREENPLAY_STEAM={build_config.build_steam} \
 	-DSCREENPLAY_TESTS={build_config.build_tests} \
 	-DSCREENPLAY_DEPLOY={build_config.build_deploy} \
-	-DSCREENPLAY_GODOT={build_config.build_godot} \
 	-DSCREENPLAY_INSTALLER={build_config.create_installer} \
 	-DSCREENPLAY_IFW_ROOT:STRING={build_config.ifw_root_path} \
     -G "Ninja" \
@@ -362,7 +363,6 @@ if __name__ == "__main__":
                         help="Create a deploy version of ScreenPlay for sharing with the world. A not deploy version is for local development only!")
     parser.add_argument('--architecture', action="store", dest="build_architecture", default="",
                         help="Sets the build architecture. Used to build x86 and ARM osx versions. Currently only works with x86_64 and arm64")
-    parser.add_argument('--build-godot', action="store", dest="build_godot", default="", help="Builds the Godot Wallpaper")
     args = parser.parse_args()
 
     qt_version = defines.QT_VERSION
@@ -406,10 +406,6 @@ if __name__ == "__main__":
     if args.build_deploy:
         build_deploy = "ON"
 
-    build_godot = "OFF"
-    if args.build_godot:
-        build_godot = "ON"
-
     create_installer = "OFF"
     if args.create_installer:
         create_installer = "ON"
@@ -426,7 +422,6 @@ if __name__ == "__main__":
     build_config.build_steam = build_steam
     build_config.build_tests = build_tests
     build_config.build_deploy = build_deploy
-    build_config.build_godot = build_godot
     build_config.create_installer = create_installer
     build_config.build_type = build_type
     build_config.screenplay_version = screenplay_version
diff --git a/Tools/build_and_publish_steam.py b/Tools/build_and_publish_steam.py
index 807b3a8c..4f45725c 100644
--- a/Tools/build_and_publish_steam.py
+++ b/Tools/build_and_publish_steam.py
@@ -67,7 +67,6 @@ if __name__ == "__main__":
     build_config.build_tests = "OFF"
     build_config.build_deploy = "ON"
     build_config.create_installer = "OFF"
-    build_config.build_godot = "OFF"
     build_config.build_type = "release"
     build_config.screenplay_version = screenplay_version