Browse Source

Simplify finding Qt5 tools

Closes #551
tags/1.9.8
falkTX 8 years ago
parent
commit
4d05ccca2c
1 changed files with 3 additions and 22 deletions
  1. +3
    -22
      source/Makefile.mk

+ 3
- 22
source/Makefile.mk View File

@@ -262,28 +262,9 @@ endif
endif

ifeq ($(HAVE_QT5),true)
QT5_LIBDIR = $(shell pkg-config --variable=libdir Qt5Core)
ifeq ($(BSD),true)
MOC_QT5 ?= $(QT5_LIBDIR)/bin/moc
RCC_QT5 ?= $(QT5_LIBDIR)/bin/rcc
endif
ifeq ($(HAIKU),true)
MOC_QT5 ?= $(QT5_LIBDIR)/../../bin/moc
RCC_QT5 ?= $(QT5_LIBDIR)/../../bin/rcc
endif
ifeq ($(MACOS),true)
MOC_QT5 ?= $(QT5_LIBDIR)/../bin/moc
RCC_QT5 ?= $(QT5_LIBDIR)/../bin/rcc
endif
ifeq ($(MOC_QT5),)
ifneq (,$(wildcard $(QT5_LIBDIR)/qt5/bin/moc))
MOC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/moc
RCC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/rcc
else
MOC_QT5 ?= $(QT5_LIBDIR)/qt/bin/moc
RCC_QT5 ?= $(QT5_LIBDIR)/qt/bin/rcc
endif
endif
QT5_HOSTBINS = $(shell pkg-config --variable=host_bins Qt5Core)
MOC_QT5 ?= $(QT5_HOSTBINS)/moc
RCC_QT5 ?= $(QT5_HOSTBINS)/rcc
ifeq (,$(wildcard $(MOC_QT5)))
HAVE_QT5=false
endif


Loading…
Cancel
Save