Commit b7255716 authored by Christoffer Ackelman's avatar Christoffer Ackelman

QT: Changed include path for qt to remove gtk/motif include files.

parent 87910e91
......@@ -126,8 +126,8 @@ log_done =
#cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) -I/usr/X11R6/include -I$(jdk)/include -I$(jdk)/include/linux \
`pkg-config --cflags gtk+-2.0` -DPREFIX=\"/usr/local\" -DSYSCONFDIR=\"/etc\" -DDATADIR=\"/usr/share\" -DLIBDIR=\"/usr/lib\" $(cmysql) $(cgtk) $(clibusb)
csetos := $(pwre_conf_cc_define)
ifeq ($(flavour),qt)
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirqt) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
ifeq ($(pwre_conf_qt),1)
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirqt)
else
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
endif
......
......@@ -125,7 +125,7 @@ log_done =
#cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) -I/usr/X11R6/include -I$(jdk)/include -I$(jdk)/include/linux \
`pkg-config --cflags gtk+-2.0` -DPREFIX=\"/usr/local\" -DSYSCONFDIR=\"/etc\" -DDATADIR=\"/usr/share\" -DLIBDIR=\"/usr/lib\" $(cmysql) $(cgtk) $(clibusb)
csetos := $(pwre_conf_cc_define)
ifeq ($(flavour),qt)
ifeq ($(pwre_conf_qt),1)
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirqt)
else
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
......@@ -199,27 +199,24 @@ mkdir := mkdir
# Set to /buildversion for frozen dbs versions
wblflags :=
warnings := -Wall -Wextra -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -Wno-sign-compare -Wno-missing-field-initializers
ifeq ($(pwre_btype),rls)
cflags := -c -O3 -D_GNU_SOURCE -DPWR_NDEBUG -D_REENTRANT -fPIC -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-narrowing
cxxflags := $(cflags)
linkflags := -O3 -L$(lib_dir)
elinkflags := -O3 -L$(lib_dir) -L$(elib_dir)
explinkflags := -g -L$(elib_dir)
clis = /lis=$(list)
dolist = /lis=$(list)
domap = -Xlinker -Map -Xlinker $(map)
cflags := $(cross_compile) -c -O3 -D_GNU_SOURCE -DPWR_NDEBUG -D_REENTRANT -fPIC $(warnings)
linkflags := $(cross_compile) -O3 -L$(lib_dir)
elinkflags := $(cross_compile) -O3 -L$(lib_dir) -L$(elib_dir)
else
cflags := -c -g -Wall -D_GNU_SOURCE -D_REENTRANT -fPIC -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-narrowing
cxxflags := $(cflags) -Wno-deprecated
mmflags := -Wno-deprecated
linkflags := -g -L$(lib_dir)
elinkflags := -g -L$(lib_dir) -L$(elib_dir)
explinkflags := -g -L$(elib_dir)
dolist = /lis=$(list)
clis :=
domap = -Xlinker -Map -Xlinker $(map)
cflags := $(cross_compile) -c -g -D_GNU_SOURCE -D_REENTRANT -fPIC $(warnings)
linkflags := $(cross_compile) -g -L$(lib_dir)
elinkflags := $(cross_compile) -g -L$(lib_dir) -L$(elib_dir)
endif
explinkflags := $(cross_compile) -g -L$(elib_dir)
cxxflags := $(cflags)
clis = /lis=$(list)
dolist = /lis=$(list)
domap = -Xlinker -Map -Xlinker $(map)
log_h_h = echo "Exporting $<"
log_x_h = echo "Exporting $< to $(notdir $@)"
log_l_obj = echo "Compiling $<"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment