Skip to content

Commit

Permalink
Merge pull request #1 from BOTLANNER/linux-exports-fix
Browse files Browse the repository at this point in the history
Linux exports fix
  • Loading branch information
BOTLANNER authored Nov 15, 2023
2 parents 567b94c + df99a38 commit 0120d90
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/build-gdextension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,11 @@ jobs:
if: ${{ startsWith(matrix.opts.identifier, 'linux-') && contains(matrix.opts.arch, 'x86_64')}}
shell: sh
run: |
sudo update-ca-certificates -v
sudo apt-get update
sudo apt-get install yasm
cd /opt
curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
curl -LO -k https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
tar xf x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
rm -f x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
mv x86_64-godot-linux-gnu_sdk-buildroot buildroot
Expand All @@ -119,10 +120,11 @@ jobs:
if: ${{ startsWith(matrix.opts.identifier, 'linux-') && contains(matrix.opts.arch, 'x86_32')}}
shell: sh
run: |
sudo update-ca-certificates -v
sudo apt-get update
sudo apt-get install yasm
cd /opt
curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/i686-godot-linux-gnu_sdk-buildroot.tar.bz2
curl -LO -k https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/i686-godot-linux-gnu_sdk-buildroot.tar.bz2
tar xf i686-godot-linux-gnu_sdk-buildroot.tar.bz2
rm -f i686-godot-linux-gnu_sdk-buildroot.tar.bz2
mv i686-godot-linux-gnu_sdk-buildroot buildroot
Expand Down Expand Up @@ -185,7 +187,9 @@ jobs:
mkdir -p project/addons/godotgif
mv demo/addons/godotgif/* project/addons/godotgif
cd project/addons/godotgif/bin
cd project/addons/godotgif
rm -rf 'godotgif.gdextension' || true
cd ./bin
rm -rf *.exp *.lib || true
cd ../../../..
Expand Down
12 changes: 6 additions & 6 deletions demo/addons/godotgif/godotgif.gdextension
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ windows.debug.x86_32 = "bin/godotgif.windows.template_debug.x86_32.dll"
windows.release.x86_32 = "bin/godotgif.windows.template_release.x86_32.dll"
windows.debug.x86_64 = "bin/godotgif.windows.template_debug.x86_64.dll"
windows.release.x86_64 = "bin/godotgif.windows.template_release.x86_64.dll"
linux.debug.x86_64 = "bin/godotgif.linux.template_debug.x86_64.so"
linux.release.x86_64 = "bin/godotgif.linux.template_release.x86_64.so"
linux.debug.arm64 = "bin/godotgif.linux.template_debug.arm64.so"
linux.release.arm64 = "bin/godotgif.linux.template_release.arm64.so"
linux.debug.rv64 = "bin/godotgif.linux.template_debug.rv64.so"
linux.release.rv64 = "bin/godotgif.linux.template_release.rv64.so"
linux.debug.x86_64 = "bin/libgodotgif.linux.template_debug.x86_64.so"
linux.release.x86_64 = "bin/libgodotgif.linux.template_release.x86_64.so"
linux.debug.arm64 = "bin/libgodotgif.linux.template_debug.arm64.so"
linux.release.arm64 = "bin/libgodotgif.linux.template_release.arm64.so"
linux.debug.rv64 = "bin/libgodotgif.linux.template_debug.rv64.so"
linux.release.rv64 = "bin/libgodotgif.linux.template_release.rv64.so"
android.debug.x86_64 = "bin/godotgif.android.template_debug.x86_64.so"
android.release.x86_64 = "bin/godotgif.android.template_release.x86_64.so"
android.debug.arm64 = "bin/godotgif.android.template_debug.arm64.so"
Expand Down
2 changes: 2 additions & 0 deletions godotgif.gdextension
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
entry_symbol = "godot_gif_library_init"
compatibility_minimum = "4.1"

[libraries]

macos.debug = "bin/godotgif.macos.template_debug.framework"
macos.release = "bin/godotgif.macos.template_release.framework"
windows.debug.x86_32 = "bin/godotgif.windows.template_debug.x86_32.dll"
Expand Down

0 comments on commit 0120d90

Please sign in to comment.