--- src/fte-unix.mak Sun Nov 13 12:47:25 2005 +++ src/fte-unix.mak Tue Feb 28 12:29:41 2006 @@ -5,9 +5,9 @@ # vfte - for Linux console directly (with limitations, see con_linux.cpp) -TARGETS = xfte vfte nfte +#TARGETS = xfte vfte nfte #TARGETS = xfte vfte sfte nfte -#TARGETS = xfte +TARGETS = xfte PRIMARY = xfte @@ -40,22 +40,22 @@ #gcc/g++ COPTIONS = -Wall -Wpointer-arith -Wconversion -Wwrite-strings \ - -Winline + -Winline -fno-rtti -fno-exceptions #CC = g++ #LD = g++ # try this for smaller/faster code and less dependencies -CC = g++ -fno-rtti -fno-exceptions -LD = g++ -fno-rtti -fno-exceptions +CC = $(CXX) +LD = $(CXX) # choose your os here ####################################################################### # Linux -UOS = -DLINUX -XINCDIR = -I/usr/X11R6/include -XLIBDIR = -L/usr/X11R6/lib -lstdc++ +UOS = -DFREEBSD +XINCDIR = -I$(LOCALBASE)/include +XLIBDIR = -L$(LOCALBASE)/lib ####################################################################### # HP/UX @@ -145,8 +145,8 @@ #OPTIMIZE = -O2 #OPTIMIZE = -O2 -s -CCFLAGS = $(OPTIMIZE) $(I18NOPTIONS) $(APPOPTIONS) $(USE_XICON) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR) -LDFLAGS = $(OPTIMIZE) $(LIBDIR) $(XLIBDIR) $(QLIBDIR) $(MLIBDIR) +CCFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $(I18NOPTIONS) $(APPOPTIONS) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR) +LDFLAGS += $(LIBDIR) $(XLIBDIR) $(MLIBDIR) OEXT = o @@ -158,7 +158,7 @@ # Need -lXt below if USE_XTINIT is defined XLIBS = -lX11 $(SOCKETLIB) $(XPMLIB) #-lmpatrol -lelf -VLIBS = -lgpm -lncurses +VLIBS = -lncurses # -ltermcap outdated by ncurses NLIBS = -lncurses SLIBS = -lslang @@ -231,6 +231,6 @@ # # include dependency files if they exist # -ifneq ($(wildcard .depend),) -include .depend -endif +#ifneq ($(wildcard .depend),) +#include .depend +#endif