More packaging tests, add msys2 types

Signed-off-by: falkTX <falktx@falktx.com>

.github/workflows/build.yml

@@ -24,6 +24,32 @@ jobs:
       - name: make
         run: make -j $(sysctl -n hw.logicalcpu)
 
+  msys2-i686:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: mingw32
+          install: mingw-w64-i686-toolchain
+      - name: make features
+        run: make features
+      - name: make
+        run: make
+
+  msys2-x86_64:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: mingw64
+          install: mingw-w64-x86_64-toolchain
+      - name: make features
+        run: make features
+      - name: make
+        run: make
+
   ubuntu-18_04:
     runs-on: ubuntu-18.04
     steps:

source/theme/Makefile

@@ -26,11 +26,10 @@ ifeq ($(HAVE_QT5),true)
 QT5_CXX_FLAGS  = $(BUILD_CXX_FLAGS) $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)
 QT5_LINK_FLAGS = $(NON_STATIC_LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets)
 QT5_STYLES_DIR = $(shell pkg-config --variable=libdir Qt5Core)/qt5/plugins/styles
-else
+else ifeq ($(HAVE_QT5PKG),true)
 ifeq ($(MACOS),true)
-ifneq ($(MACOS_OLD),true)
 ifeq ($(HAVE_PYQT),true)
-HAVE_QT5=true
+HAVE_QT5       = true
 QT5_PREFIX     = $(shell pkg-config --variable=prefix Qt5OpenGLExtensions)
 QT5_CXX_FLAGS  = $(BUILD_CXX_FLAGS) -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -I $(QT5_PREFIX)/include/qt5
 QT5_LINK_FLAGS = $(NON_STATIC_LINK_FLAGS) -F $(QT5_PREFIX)/lib -framework QtCore -framework QtGui -framework QtWidgets
@@ -38,7 +37,6 @@ QT5_STYLES_DIR = $(QT5_PREFIX)/lib/qt5/plugins/styles
 endif
 endif
 endif
-endif
 
 # ---------------------------------------------------------------------------------------------------------------------