Workflow: Fix windows build error

niceNASA · Jan 18, 2023 · e0805a1 · e0805a1
1 parent f4fa6df
commit e0805a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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 → wiliwili/source/presenter/mine_bangumi.cpp b/wiliwili/source/presenter/ming_bangumi.cpp → 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"