1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00

This is C++ code, so build and link with ${CXX}. This still blows up

later with a compiler error.
This commit is contained in:
Kris Kennaway 2002-09-08 00:30:36 +00:00
parent 529f193add
commit 21a38c944a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=65804

View File

@ -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 $<