Bläddra i källkod

Try to fix windows build

rexim 6 dagar sedan
förälder
incheckning
10219a8dca
2 ändrade filer med 5 tillägg och 4 borttagningar
  1. 3 4
      .github/workflows/ci.yml
  2. 2 0
      build_msvc.bat

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

@@ -40,11 +40,9 @@ jobs:
         env:
           CC: clang
   build-windows-msvc:
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v1
-        # this runs vcvarsall for us, so we get the MSVC toolchain in PATH.
-      - uses: seanmiddleditch/gha-setup-vsdevenv@master
+      - uses: actions/checkout@v4
       - name: download sdl2
         run: |
           curl -fsSL -o SDL2-devel-2.0.12-VC.zip https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip
@@ -53,6 +51,7 @@ jobs:
       - name: build sowon
         shell: cmd
         run: |
+          call "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
           ./build_msvc.bat
 # TODO: FreeBSD build is broken
 #  build-freebsd:

+ 2 - 0
build_msvc.bat

@@ -7,4 +7,6 @@ set LIBS=SDL2\lib\x64\SDL2.lib SDL2\lib\x64\SDL2main.lib Shell32.lib
 
 cl.exe %CXXFLAGS% /Fepng2c png2c.c /link Shell32.lib -SUBSYSTEM:console
 png2c.exe digits.png > digits.h
+png2c.exe penger_walk_sheet.png > penger_walk_sheet.h
 cl.exe %CXXFLAGS% %INCLUDES% /Fesowon main.c /link %LIBS% -SUBSYSTEM:windows
+cl.exe %CXXFLAGS% /Fesowon_rgfw main_rgfw.c /link Shell32.lib -SUBSYSTEM:windows