From a0b7463740516f9434a3f28a53090b28ffbdd80c Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Sat, 16 Sep 2000 18:11:35 +0000 Subject: Fix MASTER_SITES Add procedure of converting return character PR: 21206 Submitted by: Ports Fury --- games/xlines/files/patch-aa | 74 ++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 48 deletions(-) (limited to 'games/xlines/files/patch-aa') diff --git a/games/xlines/files/patch-aa b/games/xlines/files/patch-aa index ca54baadd9bd..7f4c05076817 100644 --- a/games/xlines/files/patch-aa +++ b/games/xlines/files/patch-aa @@ -1,53 +1,31 @@ ---- Makefile.orig Sat Jan 17 05:11:10 1998 -+++ Makefile Tue Aug 1 21:47:09 2000 -@@ -1,25 +1,25 @@ --INCDIR=/usr/local/qt/include --CFLAGS=-O2 -I/usr/X11/include --LFLAGS=-L/usr/local/qt/lib -lqt -L/usr/X11/lib -lX11 --CC=gcc --MOC=/usr/local/qt/bin/moc -- --SRC=lines.cpp lines.moc --OBJECTS=lines.o --MOCFILES=lines.moc -- -- --TARGET=xlines -- --.SUFFIXES: .cpp -- --.cpp.o: -- $(CC) -c $(CFLAGS) -I$(INCDIR) $< -- --all: $(TARGET) -- --$(TARGET): $(MOCFILES) $(OBJECTS) lines.h -- $(CC) $(OBJECTS) -o $(TARGET) $(LFLAGS) -I$(INCDIR) -- --lines.moc: lines.h -- $(MOC) lines.h -o lines.moc +--- Makefile.orig Mon Apr 27 16:47:35 1998 ++++ Makefile Sun Jul 16 19:47:51 2000 +@@ -1,8 +1,8 @@ +-INCDIR=/usr/local/qt/include +-CFLAGS=-O2 -I/usr/X11/include -DSHOW_NEXT_COLORS +-LFLAGS=-L/usr/local/qt/lib -lqt -L/usr/X11/lib -lX11 +-CC=gcc +-MOC=/usr/local/qt/bin/moc +INCDIR=${X11BASE}/include/X11/qt -+CXXFLAGS+=-I${X11BASE}/include ++CXXFLAGS+=-I${X11BASE}/include -DSHOW_NEXT_COLORS +LFLAGS=-L${X11BASE}/lib -lqt -lX11 -+CXX?=g++ ++CC?=gcc +MOC=${X11BASE}/bin/moc -+ -+SRC=lines.cpp lines.moc -+OBJECTS=lines.o -+MOCFILES=lines.moc -+ -+ -+TARGET=xlines -+ -+.SUFFIXES: .cpp -+ -+.cpp.o: + + SRC=lines.cpp lines.moc + OBJECTS=lines.o +@@ -14,12 +14,12 @@ + .SUFFIXES: .cpp + + .cpp.o: +- $(CC) -c $(CFLAGS) -I$(INCDIR) $< + $(CXX) -c $(CXXFLAGS) -I$(INCDIR) $< -+ -+all: $(TARGET) -+ -+$(TARGET): $(MOCFILES) $(OBJECTS) lines.h + + all: $(TARGET) + + $(TARGET): $(MOCFILES) $(OBJECTS) lines.h +- $(CC) $(OBJECTS) -o $(TARGET) $(LFLAGS) -I$(INCDIR) + $(CXX) $(OBJECTS) -o $(TARGET) $(LFLAGS) -I$(INCDIR) -+ -+lines.moc: lines.h -+ $(MOC) lines.h -o lines.moc + + lines.moc: lines.h + $(MOC) lines.h -o lines.moc -- cgit v1.2.3