d6599854a5
changes: added dialog for tab-focus order, file generation separate for sources and .dlg file avoid the X11R6/libXft trap update some C++ for gcc-3.3 This should fix the build errors seen in bulk builds
45 lines
1.3 KiB
Text
45 lines
1.3 KiB
Text
$NetBSD: patch-aa,v 1.4 2004/09/10 15:43:51 drochner Exp $
|
|
|
|
--- Makefile.common.orig 2001-03-20 20:58:29.000000000 +0100
|
|
+++ Makefile.common
|
|
@@ -19,10 +19,10 @@ INCDIR = -I$(QTDIR)/include -I$(TOPDIR)
|
|
|
|
ifdef BUILD_RELEASE
|
|
CFLAGS = -DQTARCH_VERSION=\"$(VERSION)-$(RELEASE)\" \
|
|
- -O2 -fno-strength-reduce -W -Wall -pipe -rdynamic
|
|
+ -O2 -fno-strength-reduce -W -Wall -pipe -rdynamic -D__unix__
|
|
else
|
|
CFLAGS = -DQTARCH_VERSION=\"$(VERSION)-$(RELEASE)\" \
|
|
- -g -Wall -W -pipe -rdynamic #-DQT_NO_COMPAT
|
|
+ -g -Wall -W -pipe -rdynamic -D__unix__ #-DQT_NO_COMPAT
|
|
endif
|
|
|
|
# Flags used by the C Compiler (not the c++ compiler)
|
|
@@ -32,14 +32,16 @@ else
|
|
C_FLAGS = -g -Wall -W -pipe -Ixmltok -Ixmlparse -DXML_NS
|
|
endif
|
|
|
|
-LFLAGS = -g -L$(QTDIR)/lib \
|
|
+LFLAGS = ${LDFLAGS} -g -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib \
|
|
widget/libwidget.a \
|
|
prop/libprop.a \
|
|
bmp/libbmp.a \
|
|
layout/liblayout.a \
|
|
pixmap/libpixmap.a \
|
|
xml/libqtarchxml.a \
|
|
- -lfl -lqt -rdynamic -ldl
|
|
+ -lfl -lqt -rdynamic \
|
|
+ -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lX11 -lXext -lSM \
|
|
+ -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lpng -lz -lstdc++
|
|
# -lfl -lqt -rdynamic $(HOME)/tmp/ccmalloc-0.2.3/src/libccmalloc.a -ldl
|
|
|
|
ARFLAGS = -crs
|
|
@@ -48,7 +50,7 @@ CC = g++
|
|
AR = ar
|
|
FLEX = flex
|
|
MAKE = gmake
|
|
-MOC = moc
|
|
+MOC = ${QTDIR}/bin/moc
|
|
|
|
ifndef QTARCHBIN
|
|
QTARCHBIN = /home/klaus/work/qtarch/qtarch/qtarch
|