commit df91d9ac064d646125f5c823f378bf5cdb377907 parent 642c19d3bf46adc77918b8cee7adf068d46ca1cb Author: Alexey Kutepov <reximkut@gmail.com> Date: Mon, 5 Jul 2021 11:01:25 +0700 Merge pull request #13 from kolumb/12 (#12) Try to fix MSVC build Diffstat:
| M | .github/workflows/ci.yml | | | 50 | ++++++++++++++++++++++++-------------------------- |
| M | src/gl_extra.h | | | 2 | ++ |
2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml @@ -42,29 +42,27 @@ jobs: ./build.sh env: 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/ diff --git a/src/gl_extra.h b/src/gl_extra.h @@ -1,6 +1,8 @@ #ifndef GL_EXTRA_H_ #define GL_EXTRA_H_ +#define GLEW_STATIC +#include <GL/glew.h> #define GL_GLEXT_PROTOTYPES #include <SDL2/SDL_opengl.h>