update build scripts

pkdawson · Mar 28, 2024 · 73d60fe · 73d60fe
1 parent 809c237
commit 73d60fe
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git 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
diff --git a/gdext/godot-cpp b/gdext/godot-cpp
diff --git a/gdext/gds_bindings.py → gdext/scripts/gds_bindings.py b/gdext/gds_bindings.py → gdext/scripts/gds_bindings.py
diff --git a/gdext/vcpkg-macos.sh → gdext/scripts/vcpkg-macos.sh b/gdext/vcpkg-macos.sh → gdext/scripts/vcpkg-macos.sh
+1 −1		.github/workflows/build.yml
+14 −0		.gitignore
+56 −0		BuildAllBindings.bat
+4 −1		dear_bindings.py
+2 −1		docs/Changelog.txt
+28 −3		docs/Readme.md
+61 −0		examples/Examples.sln
+166 −0		examples/ImGuiLib/ImGuiLib.vcxproj
+48 −0		examples/ImGuiLib/ImGuiLib.vcxproj.filters
+31 −0		examples/example_null/Makefile
+147 −0		examples/example_null/example_null.vcxproj
+14 −0		examples/example_null/example_null.vcxproj.filters
+0 −0		examples/example_null/main.c
+56 −0		examples/example_sdl2_opengl2/Makefile
+160 −0		examples/example_sdl2_opengl2/example_sdl2_opengl2.vcxproj
+40 −0		examples/example_sdl2_opengl2/example_sdl2_opengl2.vcxproj.filters
+171 −0		examples/example_sdl2_opengl2/main.c
+161 −0		examples/example_win32_directx9/example_win32_directx9.vcxproj
+42 −0		examples/example_win32_directx9/example_win32_directx9.vcxproj.filters
+251 −0		examples/example_win32_directx9/main.c
+1 −0		requirements.txt
+5 −2		README.md
+3 −2		binding_generator.py
+1 −28		include/godot_cpp/classes/wrapped.hpp
+22 −22		include/godot_cpp/core/binder_common.hpp
+29 −2		include/godot_cpp/core/class_db.hpp
+3 −3		include/godot_cpp/variant/aabb.hpp
+7 −0		include/godot_cpp/variant/variant.hpp
+5 −0		src/godot.cpp
+13 −2		test/src/example.h
+2 −1		test/src/register_types.cpp
+6 −0		tools/android.py
+3 −0		tools/godotcpp.py