Changeset View
Changeset View
Standalone View
Standalone View
audio/carla/files/patch-source_Makefile.mk
- This file was added.
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- source/Makefile.mk.orig 2017-11-21 08:44:59 UTC | |||||
| +++ source/Makefile.mk | |||||
| @@ -229,7 +229,7 @@ ifeq ($(HAVE_QT4),true) | |||||
| MOC_QT4 ?= $(shell pkg-config --variable=moc_location QtCore) | |||||
| RCC_QT4 ?= $(shell pkg-config --variable=rcc_location QtCore) | |||||
| UIC_QT4 ?= $(shell pkg-config --variable=uic_location QtCore) | |||||
| -ifeq (,$(wildcard $(MOC_QT4))) | |||||
| +ifeq (,$(MOC_QT4)) | |||||
| HAVE_QT4=false | |||||
| endif | |||||
| endif | |||||
| @@ -241,7 +241,7 @@ MOC_QT5 ?= $(QT5_LIBDIR)/../bin/moc | |||||
| RCC_QT5 ?= $(QT5_LIBDIR)/../bin/rcc | |||||
| UIC_QT5 ?= $(QT5_LIBDIR)/../bin/uic | |||||
| else # MACOS | |||||
| -ifneq (,$(wildcard $(QT5_LIBDIR)/qt5/bin/moc)) | |||||
| +ifneq (,$(QT5_LIBDIR)/qt5/bin/moc) | |||||
| MOC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/moc | |||||
| RCC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/rcc | |||||
| UIC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/uic | |||||
| @@ -251,7 +251,7 @@ RCC_QT5 ?= $(QT5_LIBDIR)/qt/bin/rcc | |||||
| UIC_QT5 ?= $(QT5_LIBDIR)/qt/bin/uic | |||||
| endif | |||||
| endif # MACOS | |||||
| -ifeq (,$(wildcard $(MOC_QT5))) | |||||
| +ifeq (,$(MOC_QT5)) | |||||
| HAVE_QT5=false | |||||
| endif | |||||
| endif | |||||
| @@ -272,14 +272,14 @@ endif | |||||
| PYUIC4 ?= /usr/bin/pyuic4 | |||||
| PYUIC5 ?= /usr/bin/pyuic5 | |||||
| -ifneq (,$(wildcard $(PYUIC4))) | |||||
| +ifneq (,$(PYUIC4)) | |||||
| HAVE_PYQT=true | |||||
| HAVE_PYQT4=true | |||||
| else | |||||
| HAVE_PYQT4=false | |||||
| endif | |||||
| -ifneq (,$(wildcard $(PYUIC5))) | |||||
| +ifneq (,$(PYUIC5)) | |||||
| HAVE_PYQT=true | |||||
| HAVE_PYQT5=true | |||||
| else | |||||