janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs.mk, qt-defs.mk: Finally made Qt 5 work without project-local definitons

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-21 14:31:44 +00:00
commit 3ebfeed3f8
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
make/defs.mk
View file

@ -628,6 +628,7 @@ ifeq ($(GCC_MAJOR),4)
endif
ifeq ($(USE_QT),true)
include $(MODDIR)/make/qtversion.mk
include $(MODDIR)/make/qt-defs.mk
endif

2
make/qt-defs.mk
View file

@ -145,6 +145,8 @@ ifeq ($(QT_MAJOR_VERSION),4)
UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES))
else
UIC_H += $(patsubst %.ui,%.h, $(UIFILES))
LOCAL_CFLAGS += -fPIC
LOCAL_CPPFLAGS += -fPIC
endif
UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES))