Tweak build, still testing

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

.github/workflows/build.yml

@@ -50,7 +50,7 @@ jobs:
       - name: make
         run: make -j $(nproc)
 
-  mingw-win32:
+  ubuntu-mingw-win32:
     runs-on: ubuntu-20.04
     env:
       CC: i686-w64-mingw32-gcc
@@ -70,7 +70,7 @@ jobs:
       - name: make
         run: make -j $(nproc)
 
-  mingw-win64:
+  ubuntu-mingw-win64:
     runs-on: ubuntu-20.04
     env:
       CC: x86_64-w64-mingw32-gcc

Makefile.dist.mk

@@ -19,7 +19,9 @@ ifeq ($(MACOS),true)
 QT5_LIB_PREFIX = lib
 endif
 
+ifeq ($(HAVE_QT5PKG),true)
 QT5_PREFIX = $(shell pkg-config --variable=prefix Qt5OpenGLExtensions)
+endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -168,7 +170,12 @@ else ifeq ($(WIN32),true)
 TARGETS = Carla-$(VERSION)-win32.zip
 endif
 
+ifeq ($(HAVE_QT5PKG),true)
 dist: $(TARGETS)
+else
+dist:
+	@echo make dist not supported in this configuration
+endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 # create final file

source/Makefile.mk

@@ -321,6 +321,7 @@ HAVE_LIBLO      = $(shell $(PKG_CONFIG) --exists liblo && echo true)
 HAVE_QT4        = $(shell $(PKG_CONFIG) --exists QtCore QtGui && echo true)
 HAVE_QT5        = $(shell $(PKG_CONFIG) --exists Qt5Core Qt5Gui Qt5Widgets && \
                           $(PKG_CONFIG) --variable=qt_config Qt5Core | grep -q -v "static" && echo true)
+HAVE_QT5PKG     = $(shell $(PKG_CONFIG) --exists Qt5OpenGLExtensions && echo true)
 HAVE_SNDFILE    = $(shell $(PKG_CONFIG) --exists sndfile && echo true)
 
 ifeq ($(HAVE_FLUIDSYNTH),true)
@@ -426,17 +427,17 @@ PYUIC ?= $(PYUIC5)
 
 ifeq ($(HAVE_QT5),true)
 HAVE_THEME = true
-else
-ifeq ($(MACOS),true)
-ifneq ($(MACOS_OLD),true)
-ifeq ($(HAVE_PYQT),true)
-HAVE_THEME = true
-MOC_QT5 ?= moc
-RCC_QT5 ?= rcc
-UIC_QT5 ?= uic
-endif
-endif
-endif
+# else
+# ifeq ($(MACOS),true)
+# ifneq ($(MACOS_OLD),true)
+# ifeq ($(HAVE_PYQT),true)
+# HAVE_THEME = true
+# MOC_QT5 ?= moc
+# RCC_QT5 ?= rcc
+# UIC_QT5 ?= uic
+# endif
+# endif
+# endif
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------