Browse Source

Merge pull request #13 from kolumb/12

(#12) Try to fix MSVC build
Alexey Kutepov 4 years ago
parent
commit
df91d9ac06
2 changed files with 26 additions and 26 deletions
  1. 24 26
      .github/workflows/ci.yml
  2. 2 0
      src/gl_extra.h

+ 24 - 26
.github/workflows/ci.yml

@@ -42,29 +42,27 @@ jobs:
           ./build.sh
           ./build.sh
         env:
         env:
           CC: clang
           CC: clang
-  # TODO(#12): Windows MSVC build is broken
-  # ---
-  # build-windows-msvc:
-  #   runs-on: windows-2019
-  #   steps:
-  #     - uses: actions/checkout@v1
-  #       # this runs vcvarsall for us, so we get the MSVC toolchain in PATH.
-  #     - uses: seanmiddleditch/gha-setup-vsdevenv@master
-  #     - name: Install dependencies
-  #       run: |
-  #         ./setup_dependencies.bat
-  #     - name: build te
-  #       shell: cmd
-  #       run: |
-  #         ./build_msvc.bat
-  #     - name: Prepare WindowsBinaries artifacts
-  #       shell: cmd
-  #       run: |
-  #         mkdir winbin
-  #         copy /B *.exe winbin
-  #         copy /B *.png winbin
-  #     - name: Upload WindowsBinaries artifacts
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #         name: WindowsBinaries
-  #         path: ./winbin/
+  build-windows-msvc:
+    runs-on: windows-2019
+    steps:
+      - uses: actions/checkout@v1
+        # this runs vcvarsall for us, so we get the MSVC toolchain in PATH.
+      - uses: seanmiddleditch/gha-setup-vsdevenv@master
+      - name: Install dependencies
+        run: |
+          ./setup_dependencies.bat
+      - name: build te
+        shell: cmd
+        run: |
+          ./build_msvc.bat
+      - name: Prepare WindowsBinaries artifacts
+        shell: cmd
+        run: |
+          mkdir winbin
+          copy /B *.exe winbin
+          copy /B *.png winbin
+      - name: Upload WindowsBinaries artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: WindowsBinaries
+          path: ./winbin/

+ 2 - 0
src/gl_extra.h

@@ -1,6 +1,8 @@
 #ifndef GL_EXTRA_H_
 #ifndef GL_EXTRA_H_
 #define GL_EXTRA_H_
 #define GL_EXTRA_H_
 
 
+#define GLEW_STATIC
+#include <GL/glew.h>
 #define GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #include <SDL2/SDL_opengl.h>
 #include <SDL2/SDL_opengl.h>