From f3ab7365124dd57d34da97963427cfe8ced2edad Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 4 Aug 2023 20:38:53 +0200 Subject: [PATCH] Rework extension structure and fix typo Removes the intermediate extension directory where the src directory with all the source files lied Fixed typo that prevented the debug macos build to load correctly --- .github/FUNDING.yml | 1 - SConstruct | 4 ++-- game/bin/summator.gdextension | 2 +- game/icon.png.import | 2 +- game/project.godot | 8 ++++++++ {extension/src => src}/register_types.cpp | 0 {extension/src => src}/register_types.h | 0 {extension/src => src}/summator.cpp | 0 {extension/src => src}/summator.h | 0 9 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 .github/FUNDING.yml rename {extension/src => src}/register_types.cpp (100%) rename {extension/src => src}/register_types.h (100%) rename {extension/src => src}/summator.cpp (100%) rename {extension/src => src}/summator.h (100%) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 1699f87..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -ko_fi: flamelizard \ No newline at end of file diff --git a/SConstruct b/SConstruct index e7a82e0..ad47a74 100644 --- a/SConstruct +++ b/SConstruct @@ -13,8 +13,8 @@ env = SConscript("godot-cpp/SConstruct") # - LINKFLAGS are for linking flags # tweak this if you want to use different folders, or more folders, to store your source code in. -env.Append(CPPPATH=["extension/src/"]) -sources = Glob("extension/src/*.cpp") +env.Append(CPPPATH=["src/"]) +sources = Glob("src/*.cpp") if env["platform"] == "macos": library = env.SharedLibrary( diff --git a/game/bin/summator.gdextension b/game/bin/summator.gdextension index 6fe79ae..a590ffd 100644 --- a/game/bin/summator.gdextension +++ b/game/bin/summator.gdextension @@ -11,5 +11,5 @@ linux.debug.arm64 = "res://bin/libgdsummator.linux.template_debug.arm64.so" linux.release.arm64 = "res://bin/libgdsummator.linux.template_release.arm64.so" windows.x86_64.debug = "res://bin/libgdsummator.windows.template_debug.x86_64.dll" windows.x86_64.release = "res://bin/libgdsummator.windows.template_release.x86_64.dll" -macos.debug = "res://bin/summator.macos.template_debug.framework" +macos.debug = "res://bin/libgdsummator.macos.template_debug.framework" macos.release = "res://bin/libgdsummator.macos.template_release.framework" diff --git a/game/icon.png.import b/game/icon.png.import index 4b2a910..03edd1b 100644 --- a/game/icon.png.import +++ b/game/icon.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.cte [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/game/project.godot b/game/project.godot index 064378a..e433a25 100644 --- a/game/project.godot +++ b/game/project.godot @@ -1,3 +1,11 @@ +; Engine configuration file. +; It's best edited using the editor UI and not directly, +; since the parameters that go here are not all obvious. +; +; Format: +; [section] ; section goes between [] +; param=value ; assign values to parameters + config_version=5 [application] diff --git a/extension/src/register_types.cpp b/src/register_types.cpp similarity index 100% rename from extension/src/register_types.cpp rename to src/register_types.cpp diff --git a/extension/src/register_types.h b/src/register_types.h similarity index 100% rename from extension/src/register_types.h rename to src/register_types.h diff --git a/extension/src/summator.cpp b/src/summator.cpp similarity index 100% rename from extension/src/summator.cpp rename to src/summator.cpp diff --git a/extension/src/summator.h b/src/summator.h similarity index 100% rename from extension/src/summator.h rename to src/summator.h