janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 22:40:38 +01:00
Code Activity

qt-defs.mk, qt-rules.mk: Several fixes and additions to qt-rules.mk and qt-defs.mk

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-09-06 19:53:44 +00:00
commit 6e1a9b1f22
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
make/qt-defs.mk
View file

@ -86,6 +86,8 @@ QT_MODULES = \
Qt5Svg \ Qt5Svg \
Qt5Test \ Qt5Test \
Qt5UiTools \ Qt5UiTools \
Qt5WebEngine \
Qt5WebEngineWidgets \
Qt5WebKit \ Qt5WebKit \
Qt5WebKitWidgets \ Qt5WebKitWidgets \
Qt5Widgets \ Qt5Widgets \
@ -119,9 +121,9 @@ QT_MODULES = \
endif endif
QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODULES)) QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODULES))
MOC ?= $(QT_BIN_PREFIX)/bin/moc MOC ?= $(QT_BIN_PREFIX)/moc
UIC ?= $(QT_BIN_PREFIX)/bin/uic UIC ?= $(QT_BIN_PREFIX)/uic
RCC ?= $(QT_BIN_PREFIX)/bin/rcc RCC ?= $(QT_BIN_PREFIX)/rcc
LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES)) LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES)) INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION) CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
@ -132,11 +134,11 @@ UIFILES += $(wildcard *.ui)
RCCFILES += $(wildcard *.qrc) RCCFILES += $(wildcard *.qrc)
ifneq ($(wildcard *.h),) ifneq ($(wildcard *.h),)
MOC_H_HC += $(shell grep -H Q_OBJECT $(wildcard *.h) | cut -d: -f1 | sort -u) MOC_H_HC += $(shell grep -l Q_OBJECT $(wildcard *.h))
endif endif
MOC_H_UI += $(patsubst %.ui,ui_%.h,$(UIFILES)) MOC_H_UI += $(patsubst %.ui,ui_%.h,$(UIFILES))
MOC_H += $(sort $(MOC_H_HC) $(MOC_H_UI)) MOC_H += $(sort $(MOC_H_HC) $(MOC_H_UI))
MOC_CPP += $(patsubst %.h,moc_%.cpp,$(MOC_H_HC)) MOC_CPP += $(patsubst %.h,moc_%.cpp,$(notdir $(MOC_H_HC)))
# $(patsubst %.ui,moc_%.cpp,$(UIFILES)) \ # $(patsubst %.ui,moc_%.cpp,$(UIFILES)) \
RCC_CPP += $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES)) RCC_CPP += $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES))
ifeq ($(QT_MAJOR_VERSION),4) ifeq ($(QT_MAJOR_VERSION),4)

2
make/qt-rules.mk
View file

@ -4,6 +4,8 @@ moc_%.cpp: %.h
else else
moc_%.cpp: %.h moc_%.cpp: %.h
$(MOC) $(filter -D% -I%,$(strip $(BUILD_CPPFLAGS))) -o $@ $< $(MOC) $(filter -D% -I%,$(strip $(BUILD_CPPFLAGS))) -o $@ $<
moc_%.cpp: include/%.h
$(MOC) $(filter -D% -I%,$(strip $(BUILD_CPPFLAGS))) -o $@ $<
endif endif
rcc_%.cpp: %.qrc rcc_%.cpp: %.qrc