Mercurial > msvpvf

changeset 35:cb2a28cef9cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' into actions
author Paper <37962225+mrpapersonic@users.noreply.github.com>
date Sun, 17 Apr 2022 02:54:08 -0400
parents 800b9eabc548 (diff) bf872a9c70d9 (current diff)
children 4c5f3d8d31e1
files
diffstat 3 files changed, 58 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.github/workflows/build.yml	Sun Apr 17 02:54:08 2022 -0400
@@ -0,0 +1,55 @@
+name: msvpvf CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build-win:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    strategy:
+      matrix:
+        include:
+          - { sys: mingw64, env: x86_64 }
+          - { sys: mingw32, env: i686 }
+    steps:
+    - name: Setup MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{matrix.sys}}
+        install: >-
+          make
+          mingw-w64-${{matrix.env}}-clang
+    - uses: actions/checkout@v2
+    - name: make
+      run: |
+        export CC=clang
+        make
+        make gui
+        strip msvpvf.exe
+        strip gui.exe
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: msvpvf-win-${{matrix.env}}-${{ github.sha }}
+        path: |
+          gui.exe
+          msvpvf.exe
+  build-mac:
+    runs-on: macOS-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: make
+      run: | 
+        make
+        strip msvpvf
+        gzip -k msvpvf
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: msvpvf-osx-${{ github.sha }}
+        path: |
+          msvpvf.gz
--- a/Makefile	Thu Apr 07 19:42:34 2022 -0400
+++ b/Makefile	Sun Apr 17 02:54:08 2022 -0400
@@ -1,4 +1,3 @@
-CC=clang
 CC_FLAGS=-Wall -O2
 LD_FLAGS=
 
--- a/src/gui.c	Thu Apr 07 19:42:34 2022 -0400
+++ b/src/gui.c	Sun Apr 17 02:54:08 2022 -0400
@@ -33,11 +33,11 @@
 #define SAVE_FILE_BUTTON 3
 
 HWND hWndListBox, hWndComboBox;
-int16_t version = 11;
-enum type {
+int16_t version = 13;
+enum types {
 	vf,
 	veg
-};
+} type;
 char* file_name = " ";
 
 void set_data(unsigned char magic[], uint16_t version, FILE* target) {