From 8e03acd36d8aa9f919c241e601cc327ca17641f2 Mon Sep 17 00:00:00 2001 From: gilzoide Date: Sat, 15 Feb 2025 09:26:21 -0300 Subject: [PATCH] Fix remove native WebGL build from Makefile and build pipeline --- .github/workflows/build.yml | 3 --- Plugins/Makefile | 12 +----------- Plugins/tools~/Dockerfile.build.webgl | 3 --- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 Plugins/tools~/Dockerfile.build.webgl diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3fee85..e070695 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,6 @@ jobs: target: docker-all-linux - platform: android target: docker-all-android - - platform: webgl - target: docker-all-webgl steps: - uses: actions/checkout@v3 - name: Cache Docker files @@ -37,7 +35,6 @@ jobs: with: name: gilzoide-sqlite-net-${{ matrix.platform }} path: | - Plugins/lib/${{ matrix.platform }}/**/*.bc Plugins/lib/${{ matrix.platform }}/**/*.dll Plugins/lib/${{ matrix.platform }}/**/*.dylib Plugins/lib/${{ matrix.platform }}/**/*.so diff --git a/Plugins/Makefile b/Plugins/Makefile index fb4e5d0..5fc15b8 100644 --- a/Plugins/Makefile +++ b/Plugins/Makefile @@ -1,7 +1,5 @@ # Android setup ANDROID_NDK_ROOT ?= -# WebGL/Emscripten setup -EMCC ?= emcc # macOS code signing setup CODESIGN ?= codesign MACOS_CODESIGN_SIGNATURE ?= @@ -20,8 +18,7 @@ BUILD_DIRS = \ lib/windows/x86_64 lib/windows/x86 lib/windows/arm64 \ lib/linux/x86_64 lib/linux/x86 \ lib/macos \ - lib/android/arm64 lib/android/arm32 lib/android/x86 lib/android/x86_64 \ - lib/webgl + lib/android/arm64 lib/android/arm32 lib/android/x86 lib/android/x86_64 SQLITE_SRC = sqlite-amalgamation/sqlite3.c SQLITE_NET_SRC = $(wildcard sqlite-net~/src/*.cs) sqlite-net~/LICENSE.txt @@ -105,14 +102,11 @@ android-arm32: lib/android/arm32/libgilzoide-sqlite-net.so android-x86_64: lib/android/x86_64/libgilzoide-sqlite-net.so android-x86: lib/android/x86/libgilzoide-sqlite-net.so -webgl: lib/webgl/libgilzoide-sqlite-net.bc - source: $(SQLITE_NET_DEST)/License.txt $(SQLITE_NET_DEST)/AssemblyInfo.cs $(SQLITE_NET_DEST)/SQLite.cs $(SQLITE_NET_DEST)/SQLiteAsync.cs all-android: android-arm64 android-arm32 android-x86_64 android-x86 all-apple: macos-universal all-linux: linux-x86_64 -all-webgl: webgl all-windows: windows-x86_64 windows-x86 all-windows-mingw: windows-mingw-x86_64 windows-mingw-x86 all-windows-llvm-mingw: windows-mingw-x86_64 windows-mingw-x86 windows-mingw-arm64 @@ -124,9 +118,6 @@ docker-all-android: docker-all-linux: docker build -f tools~/Dockerfile.build.linux --platform=linux/amd64 -t gilzoide-sqlite-net-build-linux:latest $(DOCKER_BUILD_ARGS) . docker run --rm -v "$(CURDIR)":/src -w /src --platform=linux/amd64 gilzoide-sqlite-net-build-linux:latest make all-linux -docker-all-webgl: - docker build -f tools~/Dockerfile.build.webgl -t gilzoide-sqlite-net-build-webgl:latest $(DOCKER_BUILD_ARGS) . - docker run --rm -v "$(CURDIR)":/src -w /src gilzoide-sqlite-net-build-webgl:latest make all-webgl docker-all-windows: docker build -f tools~/Dockerfile.build.windows -t gilzoide-sqlite-net-build-windows:latest $(DOCKER_BUILD_ARGS) . docker run --rm -v "$(CURDIR)":/src -w /src gilzoide-sqlite-net-build-windows:latest make all-windows-mingw @@ -141,5 +132,4 @@ download-latest-build: rsync -r $(TMPDIR)/gilzoide-sqlite-net-linux/* lib/linux/ rsync -r $(TMPDIR)/gilzoide-sqlite-net-android/* lib/android/ rsync -r $(TMPDIR)/gilzoide-sqlite-net-macos/* lib/macos/ - rsync -r $(TMPDIR)/gilzoide-sqlite-net-webgl/* lib/webgl/ $(RM) -r $(TMPDIR) diff --git a/Plugins/tools~/Dockerfile.build.webgl b/Plugins/tools~/Dockerfile.build.webgl deleted file mode 100644 index 3f92e5d..0000000 --- a/Plugins/tools~/Dockerfile.build.webgl +++ /dev/null @@ -1,3 +0,0 @@ -# syntax=docker/dockerfile:1 -# Using Emscripten 1.X for Unity <= 2021.2 support. It still works in 2021.3+. -FROM emscripten/emsdk:1.40.1