diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94c0e43..52c5776 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -170,10 +170,47 @@ jobs: name: WebGL_3-1-8 path: ./Dev/Plugin/Assets/Effekseer/Plugins + webgl_3-1-38: + name: WebGL Build with emsdk 3.1.38 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Cache emsdk + id: cache + uses: actions/cache@v1 + with: + path: ./emsdk + key: ${{ runner.os }}-emsdk-3_1-38 + + - name: install emsdk 3.1.38 + if: steps.cache.outputs.cache-hit != 'true' + run: | + git clone --depth 1 https://github.com/emscripten-core/emsdk.git + cd emsdk + ./emsdk install sdk-3.1.38-64bit + cd .. + + - run: sh scripts/clone_dependencies.sh + - run: | + ./emsdk/emsdk activate sdk-3.1.38-64bit + source ./emsdk/emsdk_env.sh + cd ./Dev/Cpp/webgl + mkdir build2019 + cd build2019 + emcmake cmake -DCMAKE_BUILD_TYPE=Release .. + make + cp libEffekseerUnity.bc ../../../Plugin/Assets/Effekseer/Plugins/WebGL/3.1.38-64bit/ + - name: Upload math result for webgl + uses: actions/upload-artifact@v1 + with: + name: WebGL_3-1-38 + path: ./Dev/Plugin/Assets/Effekseer/Plugins + merge: name: merge runs-on: ubuntu-latest - needs: [android, mac_ios, windows, webgl_1-38,webgl_2-0-19,webgl_3-1-8] + needs: [android, mac_ios, windows, webgl_1-38,webgl_2-0-19,webgl_3-1-8,webgl_3-1-38] steps: - uses: actions/checkout@v2 - name: Download Android @@ -206,6 +243,11 @@ jobs: with: name: WebGL_3-1-8 + - name: Download webgl 3.1.38 + uses: actions/download-artifact@v1 + with: + name: WebGL_3-1-38 + - name: Copy run: | mv Android/Android/libs/arm64-v8a/libEffekseerUnity.so Dev/Plugin/Assets/Effekseer/Plugins/Android/libs/arm64-v8a/ @@ -217,6 +259,7 @@ jobs: mv WebGL_1-38/WebGL/libEffekseerUnity.bc Dev/Plugin/Assets/Effekseer/Plugins/WebGL/ mv WebGL_2-0-19/WebGL/2.0.19-64bit/libEffekseerUnity.bc Dev/Plugin/Assets/Effekseer/Plugins/WebGL/2.0.19-64bit/ mv WebGL_3-1-8/WebGL/3.1.8-64bit/libEffekseerUnity.bc Dev/Plugin/Assets/Effekseer/Plugins/WebGL/3.1.8-64bit/ + mv WebGL_3-1-38/WebGL/3.1.38-64bit/libEffekseerUnity.bc Dev/Plugin/Assets/Effekseer/Plugins/WebGL/3.1.38-64bit/ mv Windows/x86/EffekseerUnity.dll Dev/Plugin/Assets/Effekseer/Plugins/x86/ mv Windows/x86_64/EffekseerUnity.dll Dev/Plugin/Assets/Effekseer/Plugins/x86_64/ - name: Upload math result diff --git a/Dev/Plugin/Assets/Effekseer/Editor/EffekseerPluginSwitcher.cs b/Dev/Plugin/Assets/Effekseer/Editor/EffekseerPluginSwitcher.cs index e9166f1..56d093d 100644 --- a/Dev/Plugin/Assets/Effekseer/Editor/EffekseerPluginSwitcher.cs +++ b/Dev/Plugin/Assets/Effekseer/Editor/EffekseerPluginSwitcher.cs @@ -10,7 +10,9 @@ public class EffekseerPluginSwitcher { static readonly string tempFilePath = "Temp/EffekseerPluginSwitcher"; -#if UNITY_2022_2_OR_NEWER +#if UNITY_2023_2_OR_NEWER + static readonly string bcPath = "WebGL/3.1.38-64bit/libEffekseerUnity.bc"; +#elif UNITY_2022_2_OR_NEWER static readonly string bcPath = "WebGL/3.1.8-64bit/libEffekseerUnity.bc"; #elif UNITY_2021_2_OR_NEWER static readonly string bcPath = "WebGL/2.0.19-64bit/libEffekseerUnity.bc"; diff --git a/Dev/Plugin/Assets/Effekseer/Plugins/WebGL/3.1.38-64bit.meta b/Dev/Plugin/Assets/Effekseer/Plugins/WebGL/3.1.38-64bit.meta new file mode 100644 index 0000000..14e8bc5 --- /dev/null +++ b/Dev/Plugin/Assets/Effekseer/Plugins/WebGL/3.1.38-64bit.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6728a1f60624558459bc32cef38a447b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dev/Plugin/Assets/Effekseer/Plugins/WebGL/3.1.38-64bit/libEffekseerUnity.bc.meta b/Dev/Plugin/Assets/Effekseer/Plugins/WebGL/3.1.38-64bit/libEffekseerUnity.bc.meta new file mode 100644 index 0000000..8323853 --- /dev/null +++ b/Dev/Plugin/Assets/Effekseer/Plugins/WebGL/3.1.38-64bit/libEffekseerUnity.bc.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: 587550b6d683aa54fad0873a0c257387 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + WebGL: WebGL + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: