blob: ed1b40a49319026a04e60e64f732bef74ac91cba (
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.5 2008/07/24 12:55:20 markd Exp $
--- qmake/Makefile.unix.orig 2008-04-28 15:11:14.000000000 +0200
+++ 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 \
@@ -88,7 +88,7 @@ DEPEND_SRC=project.cpp property.cpp meta
$(SOURCE_PATH)/src/script/qscriptstring.cpp \
$(QTSRCS)
-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
+CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore -I$(BUILD_PATH)/src/corelib/global \
-I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \
@@ -96,7 +96,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators
-DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
-DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)
-CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
+CXXFLAGS += @QMAKE_CXXFLAGS@ $(CPPFLAGS)
first all: $(BUILD_PATH)/bin/qmake
qmake: $(BUILD_PATH)/bin/qmake
|
