From 65fd744ca390a4bb0c4103992e8f1084d6933ffe Mon Sep 17 00:00:00 2001
From: Spartan322 <Megacake1234@gmail.com>
Date: Fri, 10 Nov 2023 17:51:26 -0500
Subject: [PATCH] Update to Godot 4.1.3 Stable Release

Remove env.Append(LIBPATH=godot_env["LIBPATH"])
	godot-cpp's SConstruct just directly inserts the libgodot-cpp library directly into LIBS

Fixup `scons compiledb=yes` to automatically generate the compile_commands.json
---
 .github/workflows/builds.yml |  2 +-
 README.md                    |  4 ++--
 SConstruct                   | 13 +++++++++++--
 godot-cpp                    |  2 +-
 scripts                      |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index ce7265f8..6702d908 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 env:
   GODOT_BASE_DOWNLOAD_URL: https://github.com/godotengine/godot
-  GODOT_VERSION: 4.1.1
+  GODOT_VERSION: 4.1.3
   GODOT_VERSION_TYPE: stable
   OPENVIC_BASE_BRANCH: master
 
diff --git a/README.md b/README.md
index 579a03b3..f5141aba 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Main Repo for the OpenVic Project
 For detailed instructions, view the Contributor Quickstart Guide [here](docs/contribution-quickstart-guide.md)
 
 ## System Requirements
-* [Godot 4.1.1](https://github.com/godotengine/godot/releases/tag/4.1.1-stable)
+* [Godot 4.1.3](https://github.com/godotengine/godot/releases/tag/4.1.3-stable)
 * [scons](https://scons.org/)
 
 See [System Requirements](docs/contribution/system-requirements.md).
@@ -21,7 +21,7 @@ See [Cloning](docs/contribution/cloning.md).
 ## [Godot Documentation](https://docs.godotengine.org/en/latest/)
 
 ## Build/Run Instructions
-1. Install [Godot 4.1.1](https://github.com/godotengine/godot/releases/tag/4.1.1-stable) and [scons](https://scons.org/) for your system.
+1. Install [Godot 4.1.3](https://github.com/godotengine/godot/releases/tag/4.1.3-stable) and [scons](https://scons.org/) for your system.
 2. Run the command `git submodule update --init --recursive` to retrieve all related submodules.
 3. Run `scons` in the project root, you should see a libopenvic file in `game/bin/openvic`.
 4. Open with Godot 4, click import and navigate to the `game` directory.
diff --git a/SConstruct b/SConstruct
index db5d1504..2f0b45a5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -17,12 +17,15 @@ opts = env.SetupOptions()
 env.FinalizeOptions()
 
 # Needs Clone, else godot-cpp builds using our modified environment variables. eg: godot-cpp builds on C++20
+OLD_ARGS = ARGUMENTS.copy()
+ARGUMENTS["use_static_cpp"] = False # TODO: Dependencies need to update scripts submodule
+ARGUMENTS["disable_exceptions"] = env["disable_exceptions"]
 godot_env = SConscript("godot-cpp/SConstruct")
+ARGUMENTS = OLD_ARGS
 
 # Make LIBS into a list which is easier to deal with.
 godot_env["LIBS"] = [godot_env["LIBS"]]
 env.Append(CPPPATH=godot_env["CPPPATH"])
-env.Append(LIBPATH=godot_env["LIBPATH"])
 env.Prepend(LIBS=godot_env["LIBS"])
 
 SConscript("extension/deps/SCsub", "env")
@@ -77,8 +80,14 @@ else:
         source=sources,
     )
 
+default_args = [library]
+
+# Add compiledb if the option is set
+if env.get("compiledb", False):
+    default_args += ["compiledb"]
+
 if "env" in locals():
     # FIXME: This method mixes both cosmetic progress stuff and cache handling...
     env.show_progress(env)
 
-Default(library)
+Default(default_args)
diff --git a/godot-cpp b/godot-cpp
index 1009da4d..06a6e378 160000
--- a/godot-cpp
+++ b/godot-cpp
@@ -1 +1 @@
-Subproject commit 1009da4d7e395abadfdb454cff6623e9456181c4
+Subproject commit 06a6e378bd347e6c01bd0de9ef7661835e29623e
diff --git a/scripts b/scripts
index ce1aef8d..f032dfdd 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit ce1aef8d7d9d5ba9851a1abdd981d3b796024079
+Subproject commit f032dfddf431c8653041c25838615864b675df93