diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-09-08 00:30:36 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-09-08 00:30:36 +0000 |
| commit | 21a38c944ac33cee9970e039e0eee9e2bd27ef6a (patch) | |
| tree | f700ec279030564934f85dfe27faa639f8d424ef /editors | |
| parent | This is a C++ program, not a C program..use appropriate <bsd.obj.mk> magic. (diff) | |
This is C++ code, so build and link with ${CXX}. This still blows up
later with a compiler error.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/fte/files/patch-ac | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/editors/fte/files/patch-ac b/editors/fte/files/patch-ac index 36bdc7d68a29..621f49b3c8ff 100644 --- a/editors/fte/files/patch-ac +++ b/editors/fte/files/patch-ac @@ -1,5 +1,5 @@ ---- src/fte-unix.mak Sun Feb 1 12:29:36 1998 -+++ src/fte-unix.mak.new Thu Jun 8 21:59:24 2000 +--- src/fte-unix.mak.orig Sun Feb 1 09:29:36 1998 ++++ src/fte-unix.mak Sat Sep 7 16:31:45 2002 @@ -5,17 +5,24 @@ # vfte - for Linux console directly (with limitations, see con_linux.cpp) @@ -35,12 +35,12 @@ # for GCC -CC = g++ -LD = gcc -+CC ?= g++ -+LD = ${CC} ++CXX ?= c++ ++LD = ${CXX} COPTIONS = -xc++ -Wall # for IRIX CC #CC = CC -@@ -64,9 +71,9 @@ +@@ -64,9 +71,10 @@ #OPTIMIZE = -g #OPTIMIZE = -O -g @@ -48,11 +48,12 @@ +#OPTIMIZE = -O -s -CCFLAGS = $(OPTIMIZE) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) -+CCFLAGS = $(CFLAGS) $(OPTIMIZE) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) ++CFLAGS += $(OPTIMIZE) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) ++CXXFLAGS+= $(OPTIMIZE) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) LDFLAGS = $(OPTIMIZE) $(LIBDIR) $(XLIBDIR) $(QLIBDIR) $(MLIBDIR) OEXT = o -@@ -77,7 +84,7 @@ +@@ -77,11 +85,11 @@ XLIBS = -lX11 QLIBS = -lqt @@ -61,3 +62,8 @@ MLIBS = -lXm -lXt .cpp.o: +- $(CC) $(CCFLAGS) -c $< ++ $(CXX) $(CXXFLAGS) -c $< + + .c.o: + $(CC) $(CCFLAGS) -c $< |