diff --git a/.github/workflows/gdext.yml b/.github/workflows/gdext.yml index 41b5fa3..c3e7748 100644 --- a/.github/workflows/gdext.yml +++ b/.github/workflows/gdext.yml @@ -88,12 +88,13 @@ jobs: id: cache-godot-cpp with: path: | - gdext/godot-cpp - key: ${{ runner.os }}-${{ hashFiles('gdext/godot-cpp/gdextension/extension_api.json') }} + gdext/scons_cache + key: godot-cpp-${{ runner.os }}-${{ hashFiles('gdext/godot-cpp/gdextension/extension_api.json') }} - name: Build debug run: | cd gdext + ls -R scons - name: Build release diff --git a/.gitignore b/.gitignore index 3633094..ce18ceb 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ gdext/proj/addons/imgui-godot/ gdext/samples/project/addons/ addons/imgui-godot/imgui-godot-native.gdextension addons/imgui-godot/include/*.h +scons_cache diff --git a/gdext/SConstruct b/gdext/SConstruct index 3d5c6be..f4150ac 100644 --- a/gdext/SConstruct +++ b/gdext/SConstruct @@ -6,7 +6,7 @@ import shutil import subprocess env = SConscript("godot-cpp/SConstruct") -env = env.Clone() +env.CacheDir("scons_cache") env.Append(CPPDEFINES=['IMGUI_USER_CONFIG="\\"imconfig-godot.h\\""', "IGN_EXPORT"]) env.Append(CPPPATH=["src/", "imgui/", "include/", "gen/"]) env.Replace(CXXFLAGS=str(env["CXXFLAGS"]).replace("c++17", "c++20"))