diff --git a/SConstruct b/SConstruct index a99466f..91619c6 100644 --- a/SConstruct +++ b/SConstruct @@ -18,14 +18,14 @@ sources = Glob("src/*.cpp") if env["platform"] == "macos": library = env.SharedLibrary( - "demo/bin/libgdexample.{}.{}.framework/libgdexample.{}.{}".format( + "project/addons/discord-rpc-gd/bin/libgd-discordrpc.{}.{}.framework/discord-rpc-gd.{}.{}".format( env["platform"], env["target"], env["platform"], env["target"] ), source=sources, ) else: library = env.SharedLibrary( - "demo/bin/libgdexample{}{}".format(env["suffix"], env["SHLIBSUFFIX"]), + "project/addons/discord-rpc-gd/bin/libgd-discordrpc{}{}".format(env["suffix"], env["SHLIBSUFFIX"]), source=sources, ) diff --git a/demo/addons/example/bin/libgdexample.osx.template_debug.framework/Resources/Info.plist b/demo/addons/example/bin/libgdexample.osx.template_debug.framework/Resources/Info.plist deleted file mode 100644 index fbdbd20..0000000 --- a/demo/addons/example/bin/libgdexample.osx.template_debug.framework/Resources/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleExecutable - libgdexample.template_debug - CFBundleIdentifier - org.godotengine.libgdexample - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - libgdexample.macos.template_debug - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0.0 - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1.0.0 - LSMinimumSystemVersion - 10.12 - - diff --git a/demo/addons/example/bin/libgdexample.osx.template_release.framework/Resources/Info.plist b/demo/addons/example/bin/libgdexample.osx.template_release.framework/Resources/Info.plist deleted file mode 100644 index b3bc3ca..0000000 --- a/demo/addons/example/bin/libgdexample.osx.template_release.framework/Resources/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleExecutable - libgdexample.template_release - CFBundleIdentifier - org.godotengine.libgdexample - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - libgdexample.macos.template_release - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0.0 - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1.0.0 - LSMinimumSystemVersion - 10.12 - - diff --git a/demo/addons/example/example.gdextension b/demo/addons/example/example.gdextension deleted file mode 100644 index fc40420..0000000 --- a/demo/addons/example/example.gdextension +++ /dev/null @@ -1,22 +0,0 @@ -[configuration] - -entry_symbol = "example_library_init" - -[libraries] - -macos.debug = "./bin/libgdexample.macos.template_debug.framework" -macos.release = "./bin/libgdexample.macos.template_release.framework" -windows.debug.x86_32 = "./bin/libgdexample.windows.template_debug.x86_32.dll" -windows.release.x86_32 = "./bin/libgdexample.windows.template_release.x86_32.dll" -windows.debug.x86_64 = "./bin/libgdexample.windows.template_debug.x86_64.dll" -windows.release.x86_64 = "./bin/libgdexample.windows.template_release.x86_64.dll" -linux.debug.x86_64 = "./bin/libgdexample.linux.template_debug.x86_64.so" -linux.release.x86_64 = "./bin/libgdexample.linux.template_release.x86_64.so" -linux.debug.arm64 = "./bin/libgdexample.linux.template_debug.arm64.so" -linux.release.arm64 = "./bin/libgdexample.linux.template_release.arm64.so" -linux.debug.rv64 = "./bin/libgdexample.linux.template_debug.rv64.so" -linux.release.rv64 = "./bin/libgdexample.linux.template_release.rv64.so" -android.debug.x86_64 = "./bin/libgdexample.android.template_debug.x86_64.so" -android.release.x86_64 = "./bin/libgdexample.android.template_release.x86_64.so" -android.debug.arm64 = "./bin/libgdexample.android.template_debug.arm64.so" -android.release.arm64 = "./bin/libgdexample.android.template_release.arm64.so" diff --git a/demo/.gitignore b/project/.gitignore similarity index 100% rename from demo/.gitignore rename to project/.gitignore diff --git a/demo/addons/example/bin/.gdignore b/project/addons/discord-rpc-gd/bin/.gdignore similarity index 100% rename from demo/addons/example/bin/.gdignore rename to project/addons/discord-rpc-gd/bin/.gdignore diff --git a/demo/addons/example/bin/libgdexample.linux.template_debug.x86_64.so b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.linux.template_debug.x86_64.so similarity index 77% rename from demo/addons/example/bin/libgdexample.linux.template_debug.x86_64.so rename to project/addons/discord-rpc-gd/bin/libgd-discordrpc.linux.template_debug.x86_64.so index 53a5338..18b3c22 100755 Binary files a/demo/addons/example/bin/libgdexample.linux.template_debug.x86_64.so and b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.linux.template_debug.x86_64.so differ diff --git a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll new file mode 100755 index 0000000..5069fd8 Binary files /dev/null and b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll differ diff --git a/project/addons/discord-rpc-gd/discord-rpc-gd.gdextension b/project/addons/discord-rpc-gd/discord-rpc-gd.gdextension new file mode 100644 index 0000000..3280b50 --- /dev/null +++ b/project/addons/discord-rpc-gd/discord-rpc-gd.gdextension @@ -0,0 +1,22 @@ +[configuration] + +entry_symbol = "discordrpcgd_library_init" + +[libraries] + +macos.debug = "bin/libgd-discordrpc.macos.template_debug.framework" +macos.release = "bin/libgd-discordrpc.macos.template_release.framework" +windows.debug.x86_32 = "bin/libgd-discordrpc.windows.template_debug.x86_32.dll" +windows.release.x86_32 = "bin/libgdexample.windows.template_release.x86_32.dll" +windows.debug.x86_64 = "bin/libgd-discordrpc.windows.template_debug.x86_64.dll" +windows.release.x86_64 = "bin/libgd-discordrpc.windows.template_release.x86_64.dll" +linux.debug.x86_64 = "bin/libgd-discordrpc.linux.template_debug.x86_64.so" +linux.release.x86_64 = "bin/libgd-discordrpc.linux.template_release.x86_64.so" +linux.debug.arm64 = "bin/libgd-discordrpc.linux.template_debug.arm64.so" +linux.release.arm64 = "bin/libgd-discordrpc.linux.template_release.arm64.so" +linux.debug.rv64 = "bin/libgd-discordrpc.linux.template_debug.rv64.so" +linux.release.rv64 = "bin/libgd-discordrpc.linux.template_release.rv64.so" +android.debug.x86_64 = "bin/libgd-discordrpc.android.template_debug.x86_64.so" +android.release.x86_64 = "bin/libgd-discordrpc.android.template_release.x86_64.so" +android.debug.arm64 = "bin/libgd-discordrpc.android.template_debug.arm64.so" +android.release.arm64 = "bin/libgd-discordrpc.android.template_release.arm64.so" diff --git a/demo/default_env.tres b/project/default_env.tres similarity index 100% rename from demo/default_env.tres rename to project/default_env.tres diff --git a/demo/icon.png b/project/icon.png similarity index 100% rename from demo/icon.png rename to project/icon.png diff --git a/demo/icon.png.import b/project/icon.png.import similarity index 100% rename from demo/icon.png.import rename to project/icon.png.import diff --git a/demo/main.gd b/project/main.gd similarity index 100% rename from demo/main.gd rename to project/main.gd diff --git a/demo/main.tscn b/project/main.tscn similarity index 100% rename from demo/main.tscn rename to project/main.tscn diff --git a/demo/project.godot b/project/project.godot similarity index 100% rename from demo/project.godot rename to project/project.godot diff --git a/src/register_types.cpp b/src/register_types.cpp index e22662f..2a1d324 100644 --- a/src/register_types.cpp +++ b/src/register_types.cpp @@ -36,7 +36,7 @@ void uninitialize_example_module(ModuleInitializationLevel p_level) { extern "C" { // Initialization. -GDExtensionBool GDE_EXPORT example_library_init(const GDExtensionInterface *p_interface, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) { +GDExtensionBool GDE_EXPORT discordrpcgd_library_init(const GDExtensionInterface *p_interface, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) { godot::GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization); init_obj.register_initializer(initialize_example_module);