From 1e160ee170a9a7a9a40f108b5c8f7d56dd3170ea Mon Sep 17 00:00:00 2001 From: Syping Date: Tue, 26 Mar 2024 10:21:32 +0100 Subject: [PATCH] ragephoto_c: fix header inclusion - CI: hardcore Emscripten version --- .github/workflows/webassembly-c.yml | 4 +++- .github/workflows/webassembly-cxx.yml | 6 ++++-- src/core/ragephoto_c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/webassembly-c.yml b/.github/workflows/webassembly-c.yml index 146f106..b52d951 100644 --- a/.github/workflows/webassembly-c.yml +++ b/.github/workflows/webassembly-c.yml @@ -12,7 +12,9 @@ jobs: with: submodules: recursive - name: Setup emsdk - uses: mymindstorm/setup-emsdk@v11 + uses: mymindstorm/setup-emsdk@v14 + with: + version: 3.1.47 - name: Install packages run: | sudo apt-get update -qq diff --git a/.github/workflows/webassembly-cxx.yml b/.github/workflows/webassembly-cxx.yml index 26e5c77..36d5791 100644 --- a/.github/workflows/webassembly-cxx.yml +++ b/.github/workflows/webassembly-cxx.yml @@ -12,13 +12,15 @@ jobs: with: submodules: recursive - name: Setup emsdk - uses: mymindstorm/setup-emsdk@v11 + uses: mymindstorm/setup-emsdk@v14 + with: + version: 3.1.47 - name: Install packages run: | sudo apt-get update -qq sudo apt-get install cmake ninja-build -qq - name: Configure CMake - run: emcmake cmake -B ${{github.workspace}}/build -DCMAKE_CXX_STANDARD=11 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -GNinja + run: emcmake cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DRAGEPHOTO_CXX_STANDARD=11 -GNinja - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Upload diff --git a/src/core/ragephoto_c b/src/core/ragephoto_c index 28c2211..b4596f2 100644 --- a/src/core/ragephoto_c +++ b/src/core/ragephoto_c @@ -1 +1 @@ -#include "RagePhotoA.hpp" +#include "ragephoto_c.hpp"