Browse Source

Try to fix MSVC build

rexim 4 years ago
parent
commit
4b0096c30e
3 changed files with 37 additions and 7 deletions
  1. 2 4
      .github/workflows/ci.yml
  2. 7 3
      build_msvc.bat
  3. 28 0
      setup_dependencies.bat

+ 2 - 4
.github/workflows/ci.yml

@@ -48,11 +48,9 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/checkout@v1
         # this runs vcvarsall for us, so we get the MSVC toolchain in PATH.
         # this runs vcvarsall for us, so we get the MSVC toolchain in PATH.
       - uses: seanmiddleditch/gha-setup-vsdevenv@master
       - uses: seanmiddleditch/gha-setup-vsdevenv@master
-      - name: download sdl2
+      - name: Install dependencies
         run: |
         run: |
-          curl -fsSL -o SDL2-devel-2.0.14-VC.zip https://www.libsdl.org/release/SDL2-devel-2.0.14-VC.zip
-          tar -xf SDL2-devel-2.0.14-VC.zip
-          mv SDL2-2.0.14 SDL2
+          ./setup_dependencies.bat
       - name: build te
       - name: build te
         shell: cmd
         shell: cmd
         run: |
         run: |

+ 7 - 3
build_msvc.bat

@@ -2,7 +2,11 @@
 rem launch this from msvc-enabled console
 rem launch this from msvc-enabled console
 
 
 set CFLAGS=/W4 /WX /std:c11 /wd4996 /FC /TC /Zi /nologo
 set CFLAGS=/W4 /WX /std:c11 /wd4996 /FC /TC /Zi /nologo
-set INCLUDES=/I SDL2\include
-set LIBS=SDL2\lib\x64\SDL2.lib SDL2\lib\x64\SDL2main.lib Shell32.lib
+set INCLUDES=/I dependencies\SDL2\include /I dependencies\GLFW\include /I dependencies\GLEW\include
+set LIBS=dependencies\SDL2\lib\x64\SDL2.lib ^
+         dependencies\SDL2\lib\x64\SDL2main.lib ^
+         dependencies\GLFW\lib\glfw3.lib ^
+         dependencies\GLEW\lib\glew32s.lib ^
+         opengl32.lib User32.lib Gdi32.lib Shell32.lib
 
 
-cl.exe %CFLAGS% %INCLUDES% /Fete src\main.c src\la.c src\editor.c src\font.c src\sdl_extra.c /link %LIBS% -SUBSYSTEM:windows
+cl.exe %CFLAGS% %INCLUDES% /Fete src\main.c src\la.c src\editor.c src\font.c src\sdl_extra.c src\file.c src\gl_extra.c /link %LIBS% -SUBSYSTEM:windows

+ 28 - 0
setup_dependencies.bat

@@ -0,0 +1,28 @@
+@echo off
+
+curl -fsSL -o SDL2-devel-2.0.12-VC.zip https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip
+tar -xf SDL2-devel-2.0.12-VC.zip
+if not exist dependencies\ mkdir dependencies\
+move SDL2-2.0.12 dependencies\SDL2
+del SDL2-devel-2.0.12-VC.zip
+if not exist dependencies\SDL2\temp\ mkdir dependencies\SDL2\temp\
+move dependencies\SDL2\include dependencies\SDL2\temp\SDL2
+move dependencies\SDL2\temp dependencies\SDL2\include
+
+curl -fsSL -o glfw-3.3.2.bin.WIN64.zip https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN64.zip
+tar -xf glfw-3.3.2.bin.WIN64.zip
+if not exist dependencies\GLFW\lib\ mkdir dependencies\GLFW\lib\
+move glfw-3.3.2.bin.WIN64\lib-vc2019\glfw3.lib dependencies\GLFW\lib\glfw3.lib
+if not exist dependencies\GLFW\include\GLFW mkdir dependencies\GLFW\include\GLFW
+move glfw-3.3.2.bin.WIN64\include\GLFW\glfw3.h dependencies\GLFW\include\GLFW\glfw3.h
+del glfw-3.3.2.bin.WIN64.zip
+rmdir /s /q glfw-3.3.2.bin.WIN64
+
+curl -fsSL -o glew-2.1.0-win32.zip https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0-win32.zip/download
+tar -xf glew-2.1.0-win32.zip
+if not exist dependencies\GLEW\lib\ mkdir dependencies\GLEW\lib\
+move glew-2.1.0\lib\Release\x64\glew32s.lib dependencies\GLEW\lib\glew32s.lib
+if not exist dependencies\GLEW\include\GL\ mkdir dependencies\GLEW\include\GL\
+move glew-2.1.0\include\GL\glew.h dependencies\GLEW\include\GL\glew.h
+del glew-2.1.0-win32.zip
+rmdir /s /q glew-2.1.0