Fix windows build

huxingyi · Dec 16, 2022 · 7a29cf7 · 7a29cf7
1 parent e729f77
commit 7a29cf7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -27,7 +27,7 @@ jobs:
           if ! git diff --ignore-space-at-eol --exit-code; then
             exit 1
           fi
-  build:
+  linux-build:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v3
@@ -39,4 +39,27 @@ jobs:
         run: |
           cd ${GITHUB_WORKSPACE}/application
           qmake
-          make -j`nproc`
+          make -j`nproc`
+  win32-msvc-build:
+    runs-on: 	windows-2019
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Visual Studio shell
+        uses: egor-tensin/vs-shell@v2
+        with:
+          arch: x64
+      - name: Install Qt
+        # Generated by https://ddalcino.github.io/aqt-list-server/
+        uses: jurplel/install-qt-action@v3
+        with:
+          aqtversion: '==2.1.*'
+          version: '5.15.2'
+          host: 'windows'
+          target: 'desktop'
+          arch: 'win64_msvc2019_64'
+          archives: 'qttools qtsvg qtimageformats qtbase opengl32sw'
+      - name: Build application
+        run: |
+          cd $env:GITHUB_WORKSPACE/application
+          qmake -spec win32-msvc
+          nmake -f Makefile.Release
diff --git a/dust3d/mesh/mesh_recombiner.cc b/dust3d/mesh/mesh_recombiner.cc
@@ -20,6 +20,7 @@
  *  SOFTWARE.
  */
 
+#include <array>
 #include <cmath>
 #include <dust3d/base/position_key.h>
 #include <dust3d/mesh/hole_wrapper.h>

diff --git a/dust3d/mesh/mesh_state.cc b/dust3d/mesh/mesh_state.cc
@@ -20,6 +20,7 @@
  *  SOFTWARE.
  */
 
+#include <array>
 #include <dust3d/base/debug.h>
 #include <dust3d/mesh/mesh_recombiner.h>
 #include <dust3d/mesh/mesh_state.h>

diff --git a/dust3d/mesh/section_remesher.cc b/dust3d/mesh/section_remesher.cc
@@ -20,6 +20,7 @@
  *  SOFTWARE.
  */
 
+#include <algorithm>
 #include <dust3d/mesh/section_remesher.h>
 
 namespace dust3d {