Browse Source

Fix install when qt headers don't match default pyqt

tags/1.9.7
falkTX 9 years ago
parent
commit
ccbe199509
1 changed files with 7 additions and 6 deletions
  1. +7
    -6
      Makefile

+ 7
- 6
Makefile View File

@@ -13,9 +13,15 @@ LINK := ln -sf
ifeq ($(DEFAULT_QT),4) ifeq ($(DEFAULT_QT),4)
PYUIC ?= pyuic4 -w PYUIC ?= pyuic4 -w
PYRCC ?= pyrcc4 -py3 PYRCC ?= pyrcc4 -py3
ifeq ($(HAVE_QT4),true)
HAVE_THEME = true
endif
else else
PYUIC ?= pyuic5 PYUIC ?= pyuic5
PYRCC ?= pyrcc5 PYRCC ?= pyrcc5
ifeq ($(HAVE_QT5),true)
HAVE_THEME = true
endif
endif endif


# ---------------------------------------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------------------------------------
@@ -146,13 +152,8 @@ interposer:
plugin: backend bridges-plugin bridges-ui discovery plugin: backend bridges-plugin bridges-ui discovery
@$(MAKE) -C source/plugin @$(MAKE) -C source/plugin


# FIXME
ifeq ($(HAVE_QT),true)
theme: theme:
@$(MAKE) -C source/theme @$(MAKE) -C source/theme
else
theme:
endif


# ---------------------------------------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------------------------------------
# Binaries (posix32) # Binaries (posix32)
@@ -499,7 +500,7 @@ endif
data/carla-bridge-lv2-modgui \ data/carla-bridge-lv2-modgui \
$(DESTDIR)$(LIBDIR)/carla $(DESTDIR)$(LIBDIR)/carla


ifeq ($(HAVE_QT),true)
ifeq ($(HAVE_THEME),true)
# Install theme # Install theme
install -m 644 \ install -m 644 \
bin/styles/* \ bin/styles/* \


Loading…
Cancel
Save