diff --git a/gdext/SConstruct b/gdext/SConstruct index 745261f..2ce4c63 100644 --- a/gdext/SConstruct +++ b/gdext/SConstruct @@ -1,6 +1,7 @@ #!/usr/bin/env python from glob import glob from pathlib import Path +import os import shutil import subprocess @@ -22,10 +23,12 @@ if windows: elif linux: triplet = "x64-linux" else: - subprocess.call("zsh vcpkg-macos.sh", shell=True) + if not os.path.exists("vcpkg_installed/arm64-osx"): + subprocess.call("zsh scripts/vcpkg-macos.sh", shell=True) triplet = "arm64-osx" -subprocess.call("python gds_bindings.py", shell=True) +if not os.path.exists("gen/imgui_bindings.gen.h"): + subprocess.call("python scripts/gds_bindings.py", shell=True) sources = Glob("src/*.cpp") + Glob("imgui/*.cpp") + Glob("gen/*.cpp") @@ -39,12 +42,13 @@ libs = [env["LIBS"]] env.Append(CPPPATH=["imgui/misc/freetype/"]) env.Append(CPPPATH=[f"vcpkg_installed/{triplet}/include"]) -env.Append(CPPDEFINES=["IMGUI_ENABLE_FREETYPE"]) #, "IMGUI_ENABLE_FREETYPE_LUNASVG"]) +env.Append(CPPDEFINES=["IMGUI_ENABLE_FREETYPE"]) +# env.Append(CPPDEFINES=["IMGUI_ENABLE_FREETYPE_LUNASVG"]) sources += Glob("imgui/misc/freetype/*.cpp") libpath += [f"vcpkg_installed/{triplet}/lib"] libs += [ "freetype", -# "lunasvg", + # "lunasvg", "bz2", "libpng16" if windows else "png16", "zlib" if windows else "z", diff --git a/gdext/dear_bindings b/gdext/dear_bindings index 0c33579..e5f8785 160000 --- a/gdext/dear_bindings +++ b/gdext/dear_bindings @@ -1 +1 @@ -Subproject commit 0c33579c155a8d87dcbfab68b508157396eb10ca +Subproject commit e5f87859d48d1ba4caf3c2c660c42a06fd261631 diff --git a/gdext/godot-cpp b/gdext/godot-cpp index 78ffea5..51c752c 160000 --- a/gdext/godot-cpp +++ b/gdext/godot-cpp @@ -1 +1 @@ -Subproject commit 78ffea5b136f3178c31cddb28f6b963ceaa89420 +Subproject commit 51c752c46b44769d3b6c661526c364a18ea64781 diff --git a/gdext/gds_bindings.py b/gdext/scripts/gds_bindings.py similarity index 100% rename from gdext/gds_bindings.py rename to gdext/scripts/gds_bindings.py diff --git a/gdext/vcpkg-macos.sh b/gdext/scripts/vcpkg-macos.sh similarity index 100% rename from gdext/vcpkg-macos.sh rename to gdext/scripts/vcpkg-macos.sh