From 27fe5b1cd33ee9e825d5271f3760323a70917a13 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 1 Jan 2021 02:17:50 +0000 Subject: [PATCH] Better way to find qt5 prefix on macOS for theme build --- source/theme/Makefile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/source/theme/Makefile b/source/theme/Makefile index 968324428..944e2f1e2 100644 --- a/source/theme/Makefile +++ b/source/theme/Makefile @@ -10,10 +10,6 @@ include ../modules/Makefile.mk # --------------------------------------------------------------------------------------------------------------------- -ifeq ($(MACOS),true) -MAC_BUILDS_PREFIX = ~/builds/carla -endif - ifeq ($(WIN32),true) NON_STATIC_LINK_FLAGS = $(shell echo $(LINK_FLAGS) | awk 'sub(" -static","")') -static-libgcc else @@ -34,17 +30,14 @@ else ifeq ($(MACOS),true) ifeq ($(HAVE_PYQT),true) HAVE_QT5=true -QT5_CXX_FLAGS = $(BUILD_CXX_FLAGS) -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -QT5_LINK_FLAGS = $(NON_STATIC_LINK_FLAGS) -F $(MAC_BUILDS_PREFIX)/lib -framework QtCore -framework QtGui -framework QtWidgets -QT5_STYLES_DIR = $(MAC_BUILDS_PREFIX)/lib/qt5/plugins/styles +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 +QT5_STYLES_DIR = $(QT5_PREFIX)/lib/qt5/plugins/styles endif endif endif -ifeq ($(MACOS),true) -QT5_CXX_FLAGS += -I $(MAC_BUILDS_PREFIX)/include/qt5 -endif - # --------------------------------------------------------------------------------------------------------------------- ifeq ($(HAVE_QT4),true)