blob: e943ab14b48419eb8c70fd433bc3bd30bdcc059f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
$NetBSD: patch-af,v 1.9 2012/01/12 22:59:58 adam Exp $
--- qmake/Makefile.unix.orig 2011-12-08 05:06:02.000000000 +0000
+++ qmake/Makefile.unix
@@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@
QTOBJS = @QMAKE_QTOBJS@
QTSRCS = @QMAKE_QTSRCS@
QMAKESPEC = @QMAKESPEC@
-LFLAGS = @QMAKE_LFLAGS@
+LFLAGS = @QMAKE_LFLAGS@ ${LDFLAGS}
#qmake code
OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \
@@ -73,7 +73,7 @@ DEPEND_SRC=project.cpp property.cpp meta
$(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \
$(QTSRCS)
-CPPFLAGS = -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \
+CPPFLAGS += -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \
-Igenerators/mac -Igenerators/symbian -Igenerators/integrity \
-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
-I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \
@@ -84,7 +84,7 @@ CPPFLAGS = -g -I. -Igenerators -Igenerat
-DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
-DQT_NO_GEOM_VARIANT -DQT_NO_DEPRECATED $(OPENSOURCE_CXXFLAGS)
-CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
+CXXFLAGS += @QMAKE_CXXFLAGS@ $(CPPFLAGS)
first all: $(BUILD_PATH)/bin/qmake
qmake: $(BUILD_PATH)/bin/qmake
|
