aboutsummaryrefslogtreecommitdiff
path: root/cad/qcad2/files/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'cad/qcad2/files/patch-aa')
-rw-r--r--cad/qcad2/files/patch-aa38
1 files changed, 31 insertions, 7 deletions
diff --git a/cad/qcad2/files/patch-aa b/cad/qcad2/files/patch-aa
index 00324d454cee..0da0db8c2b33 100644
--- a/cad/qcad2/files/patch-aa
+++ b/cad/qcad2/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig Fri May 5 12:57:18 2000
-+++ Makefile Thu May 11 16:03:04 2000
-@@ -7,13 +7,12 @@
+--- Makefile.orig Sat Aug 12 03:31:54 2000
++++ Makefile Sat Sep 23 06:33:52 2000
+@@ -7,13 +7,15 @@
####### Compiler, tools and options
@@ -11,12 +11,36 @@
-LFLAGS = -static
-LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11
-MOC = moc
-+CFLAGS += -Wall -W -fno-strength-reduce
-+INCPATH = -I$(X11BASE)/include/qt2 -I$(X11BASE)/include
++CC ?= gcc
++CXX ?= g++
++CFLAGS ?= -Wall -W -O2 -fno-strength-reduce
++CXXFLAGS?= -Wall -W -O2 -fno-strength-reduce
++INCPATH = -I$(QTDIR)/include/qt2
+LINK = $(CXX)
+LFLAGS =
-+LIBS = -L$(X11BASE)/lib -lqt2 -lX11
-+MOC = moc2
++LIBS = -L$(QTDIR)/lib -lqt2
++MOC = $(QTDIR)/bin/moc2
####### Files
+@@ -351,16 +353,16 @@
+ .SUFFIXES: .cpp .cxx .cc .C .c
+
+ .cpp.o:
+- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+
+ .cxx.o:
+- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+
+ .cc.o:
+- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+
+ .C.o:
+- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+
+ .c.o:
+ $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<