From e0805a1a78e217245daaf9f91fc7f449bd489a22 Mon Sep 17 00:00:00 2001 From: xfangfang <2553041586@qq.com> Date: Wed, 18 Jan 2023 14:19:33 +0800 Subject: [PATCH] Workflow: Fix windows build error --- .github/workflows/build.yaml | 7 ++++--- .../presenter/{ming_bangumi.cpp => mine_bangumi.cpp} | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) rename wiliwili/source/presenter/{ming_bangumi.cpp => mine_bangumi.cpp} (100%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f1846cd5a..d24f9d3cb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -108,6 +108,10 @@ jobs: submodules: 'recursive' fetch-depth: 0 + - name: Update gamepad db + run: | + cmake -P library/borealis/library/lib/extern/glfw//CMake/GenerateMappings.cmake library/borealis/library/lib/extern/glfw//src/mappings.h.in library/borealis/library/lib/extern/glfw//src/mappings.h + - name: Install dependency uses: msys2/setup-msys2@v2 with: @@ -128,9 +132,6 @@ jobs: DIST_EXE="${{ needs.version.outputs.DIST_EXE }}" echo ${VERSION} ${DIST_EXE} - BRLS_GLFW="library/borealis/library/lib/extern/glfw/" - cmake -P ${BRLS_GLFW}/CMake/GenerateMappings.cmake ${BRLS_GLFW}/src/mappings.h.in ${BRLS_GLFW}/src/mappings.h - mkdir -p build && pushd build cmake .. -G "MinGW Makefiles" -DPLATFORM_DESKTOP=ON -DWIN32_TERMINAL=OFF -DCMAKE_BUILD_TYPE=Release mingw32-make wiliwili -j4 diff --git a/wiliwili/source/presenter/ming_bangumi.cpp b/wiliwili/source/presenter/mine_bangumi.cpp similarity index 100% rename from wiliwili/source/presenter/ming_bangumi.cpp rename to wiliwili/source/presenter/mine_bangumi.cpp index c8fb63ee6..0b22608d8 100644 --- a/wiliwili/source/presenter/ming_bangumi.cpp +++ b/wiliwili/source/presenter/mine_bangumi.cpp @@ -2,8 +2,8 @@ // Created by fang on 2023/1/18. // -#include "bilibili.h" #include "borealis.hpp" +#include "bilibili.h" #include "presenter/mine_bangumi.hpp" #include "utils/config_helper.hpp"