added mingw CI build

Author: jtsiomb

.github/workflows/build_gnulinux.yml

@@ -7,7 +7,6 @@ on:
 
 jobs:
   build:
-    name: build meshfile library
     runs-on: ubuntu-latest
 
     steps:
@@ -24,7 +23,7 @@ jobs:
         sudo make install
 
     - name: configure
-      run: ./configure --enable-opt --prefix=$(pwd)/meshfile-build/meshfile-build
+      run: ./configure --enable-opt --prefix=$(pwd)/staging/meshfile-gnulinux
 
     - name: build
       run: make
@@ -38,11 +37,11 @@ jobs:
     - name: stage install
       run: |
         make install-all
-        tree meshfile-build
+        tree staging
 
     - uses: actions/upload-artifact@v4
       with:
-          name: meshfile-build
-          path: meshfile-build
+          name: meshfile-gnulinux
+          path: staging
 
 # vi:ts=2 sts=2 sw=2 expandtab:

.github/workflows/build_win_mingw.yml

@@ -0,0 +1,55 @@
+name: Windows (mingw) build
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: MINGW64
+        install: |
+          mingw-w64-x86_64-gcc make git mingw-w64-x86_64-freeglut
+          mingw-w64-x86_64-libpng mingw-w64-x86_64-libjpeg-turbo
+
+    - name: install meshview dependencies
+      run: |
+        git clone https://github.com/jtsiomb/libimago
+        cd libimago
+        ./configure
+        make
+        make install
+
+    - name: configure
+      run: ./configure --enable-opt --prefix=$(pwd)/staging/meshfile-mingw64
+
+    - name: build
+      run: make
+
+    - name: build meshview
+      run: |
+        cd meshview
+        make CFLAGS='-I../include -I/usr/local/include' LDFLAGS='-L.. -L/usr/local/lib -lmeshfile -lfreeglut -lopengl32 -lglu32 -limago -lpng -ljpeg'
+
+    - name: build meshconv
+      run: make meshconv
+
+    - name: stage install
+      run: |
+        make install-all
+
+    - uses: actions/upload-artifact@v4
+      with:
+          name: meshfile-mingw64
+          path: staging
+
+# vi:ts=2 sts=2 sw=2 expandtab:

Makefile

@@ -56,18 +56,20 @@ install: $(liba)
 	cp include/meshfile.h $(DESTDIR)$(PREFIX)/include/meshfile.h
 	cp $(liba) $(DESTDIR)$(PREFIX)/$(libdir)/$(liba)
 	cp $(libso) $(DESTDIR)$(PREFIX)/$(libdir)/$(libso)
-	rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname)
-	rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(ldname)
-	ln -s $(libso) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname)
-	ln -s $(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(ldname)
+	[ -n "$(soname)" ] && \
+		rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
+		rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(ldname) && \
+		ln -s $(libso) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
+		ln -s $(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(ldname) || true
 
 .PHONY: uninstall
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/include/meshfile.h
 	rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(liba)
 	rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(libso)
-	rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname)
-	rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(ldname)
+	[ -n "$(soname)" ] && \
+		rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
+		rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(ldname) || true
 
 
 .PHONY: tools

meshview/Makefile

@@ -4,8 +4,8 @@ obj = meshview.o
 
 bin = meshview
 
-CFLAGS = $(warn) $(opt) $(dbg) -I../include -I$(PREFIX)/include $(sysincdirs)
-LDFLAGS = -L.. -L$(PREFIX)/$(libdir) -lmeshfile -lglut -lX11 -lXmu -lGL -lGLU -limago -lm
+CFLAGS = $(warn) $(opt) $(dbg) -I../include -I$(PREFIX)/include $(sysincdirs) $(CFLAGS_cfg)
+LDFLAGS = -L.. -L$(PREFIX)/$(libdir) $(LDFLAGS_cfg) -lmeshfile -lglut -lX11 -lXmu -lGL -lGLU -limago -lm
 
 $(bin): $(obj) ../libmeshfile.a
 	$(CC) -o $(bin) $(obj) $(LDFLAGS)

src/json.c

@@ -4,7 +4,7 @@
 #include <ctype.h>
 #include "dynarr.h"
 
-#if defined(_MSC_VER) || defined(__WATCOMC__)
+#if defined(_WIN32) || defined(__WATCOMC__)
 #include <malloc.h>
 #else
 #if !defined(__FreeBSD__) && !defined(__OpenBSD__)