diff options
Diffstat (limited to 'devel/tmake/files')
| -rw-r--r-- | devel/tmake/files/patch-aa | 10 | ||||
| -rw-r--r-- | devel/tmake/files/patch-ab | 11 |
2 files changed, 13 insertions, 8 deletions
diff --git a/devel/tmake/files/patch-aa b/devel/tmake/files/patch-aa index db4f7b126858..67fdc0bb03c4 100644 --- a/devel/tmake/files/patch-aa +++ b/devel/tmake/files/patch-aa @@ -1,6 +1,6 @@ ---- lib/unix/generic.t Tue Aug 22 14:23:51 2000 -+++ lib/unix/generic.t.new Fri Sep 1 17:08:50 2000 -@@ -201,10 +201,10 @@ +--- lib/unix/generic.t Mon Dec 4 03:26:06 2000 ++++ lib/unix/generic.t.new Mon Jan 15 11:42:17 2001 +@@ -205,10 +205,10 @@ ####### Compiler, tools and options @@ -10,8 +10,8 @@ -CXXFLAGS= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); +CC ?= #$ Expand("TMAKE_CC"); +CXX ?= #$ Expand("TMAKE_CXX"); -+CFLAGS ?= #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -+CXXFLAGS?= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); ++CFLAGS += #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); ++CXXFLAGS+= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); INCPATH = #$ ExpandPath("INCPATH","-I"," -I",""); #$ Config("staticlib") && DisableOutput(); LINK = #$ Expand("TMAKE_LINK"); diff --git a/devel/tmake/files/patch-ab b/devel/tmake/files/patch-ab index 443c1fe3dee3..c681d27654b8 100644 --- a/devel/tmake/files/patch-ab +++ b/devel/tmake/files/patch-ab @@ -1,5 +1,5 @@ ---- lib/freebsd-g++/tmake.conf.orig Wed Aug 23 18:03:32 2000 -+++ lib/freebsd-g++/tmake.conf Sun Oct 29 10:03:53 2000 +--- lib/freebsd-g++/tmake.conf Sat Nov 4 19:00:02 2000 ++++ lib/freebsd-g++/tmake.conf.new Mon Jan 15 11:44:12 2001 @@ -31,7 +31,7 @@ TMAKE_LIBDIR = /usr/local/lib TMAKE_INCDIR_X11 = /usr/X11R6/include @@ -9,7 +9,7 @@ TMAKE_LIBDIR_QT = $(QTDIR)/lib TMAKE_INCDIR_OPENGL = /usr/X11R6/include TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -@@ -51,8 +51,8 @@ +@@ -51,12 +51,12 @@ TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_X11SM = -lICE -lSM @@ -20,3 +20,8 @@ TMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu TMAKE_LIBS_THREAD = +-TMAKE_MOC = $(QTDIR)/bin/moc ++TMAKE_MOC = $(QTDIR)/bin/moc2 + TMAKE_UIC = $(QTDIR)/bin/uic + + TMAKE_AR = ar cqs |