diff --git a/nimlib.gdnlib b/nimlib.gdnlib new file mode 100644 index 0000000..483a17e --- /dev/null +++ b/nimlib.gdnlib @@ -0,0 +1,18 @@ +[entry] + +X11.64="res://_dlls/nim_linux_64.so" +X11.32="res://_dlls/nim_linux_32.so" +Windows.64="res://_dlls/nim_64.dll" +Windows.32="res://_dlls/nim_32.dll" +OSX.64="res://_dlls/nim_mac.dylib" +Android.armeabi-v7a="res://_dlls/armeabi-v7a/libnim_android.so" +iOS.armv7="res://_dlls/nim_ios_32.a" +iOS.arm64="res://_dlls/nim_ios_64.a" + +[general] + +singleton=false +load_once=true +symbol_prefix="godot_" + +[dependencies] diff --git a/nimlib.tres b/nimlib.tres deleted file mode 100644 index df70bfc..0000000 --- a/nimlib.tres +++ /dev/null @@ -1,13 +0,0 @@ -[gd_resource type="GDNativeLibrary" format=2] - -[resource] - -platform/X11_32bit = "res://_dlls/nim_linux_32.so" -platform/X11_64bit = "res://_dlls/nim_linux_64.so" -platform/Windows_32bit = "res://_dlls/nim_32.dll" -platform/Windows_64bit = "res://_dlls/nim_64.dll" -platform/OSX = "res://_dlls/nim_mac.dylib" -platform/Android = "res://nim_android.so" -platform/iOS_32bit = "res://_dlls/nim_ios_32.dylib" -platform/iOS_64bit = "res://_dlls/nim_ios_64.dylib" -platform/WebAssembly = "" diff --git a/project.godot b/project.godot index d6ec3e0..30c39e5 100644 --- a/project.godot +++ b/project.godot @@ -1,8 +1,8 @@ ; 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: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/scripts/FPSCounter.gdns b/scripts/FPSCounter.gdns index bae69db..f7ea828 100644 --- a/scripts/FPSCounter.gdns +++ b/scripts/FPSCounter.gdns @@ -1,6 +1,6 @@ [gd_resource type="NativeScript" load_steps=2 format=2] -[ext_resource path="res://nimlib.tres" type="GDNativeLibrary" id=1] +[ext_resource path="res://nimlib.gdnlib" type="GDNativeLibrary" id=1] [resource] diff --git a/scripts/MainPanel.gdns b/scripts/MainPanel.gdns index 4458a47..883f90c 100644 --- a/scripts/MainPanel.gdns +++ b/scripts/MainPanel.gdns @@ -1,6 +1,6 @@ [gd_resource type="NativeScript" load_steps=2 format=2] -[ext_resource path="res://nimlib.tres" type="GDNativeLibrary" id=1] +[ext_resource path="res://nimlib.gdnlib" type="GDNativeLibrary" id=1] [resource] diff --git a/src/stub.nimble b/src/stub.nimble index 8118595..c70213b 100644 --- a/src/stub.nimble +++ b/src/stub.nimble @@ -4,7 +4,7 @@ description = "Godot-Nim Project Stub" license = "MIT" bin = @["stub"] -requires "godot >= 0.6.0 & < 0.7.0" +requires "godot >= 0.6.8 & < 0.7.0" task make, "build": const bitsPostfix = when sizeof(int) == 8: "_64" else: "_32" @@ -16,7 +16,7 @@ task make, "build": elif defined(macosx): "nim_mac.dylib" elif defined(android): - "nim_android.so" + "libnim_android.so" elif defined(linux): "nim_linux" & bitsPostfix & ".so" else: nil