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

make: Modify only BUILD_*FLAGS in jw-build/make/*.mk

Browse source 
Assign only to BUILD_XXXFLAGS in jw-build/make/*.mk, and leave PROJECT_XXXFLAGS
and LOCAL_XXXFLAGS alone.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-04-10 06:43:40 +00:00
commit 49f269bdfe
12 changed files with 74 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/qt-defs.mk
View file

@ -125,7 +125,7 @@ MOC ?= $(QT_BIN_PREFIX)/moc
UIC ?= $(QT_BIN_PREFIX)/uic
RCC ?= $(QT_BIN_PREFIX)/rcc
BUILD_LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
BUILD_INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
BUILD_INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
CXXFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
# ------------------------------- jw-build defs
@ -145,8 +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_CXXFLAGS += -fPIC
BUILD_CFLAGS += -fPIC
BUILD_CXXFLAGS += -fPIC
endif
UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES))