[packages/freelords.git] / freelords-make.patch

diff -urN freelords.org/src/Makefile freelords/src/Makefile
--- freelords.org/src/Makefile	Sat Feb 17 15:11:25 2001
+++ freelords/src/Makefile	Sat Feb 17 15:23:13 2001
@@ -4,7 +4,7 @@
 
 CXX		= g++
 QTDIRECTORY	= $(QTDIR)
-MOC		= $(QTDIRECTORY)/bin/moc
+MOC		= /usr/X11R6/bin/moc
 
 COMMON_OBJECTS	= common/mapdef.o common/army.o common/citylist.o 	\
 		  common/stacklist.o common/ruinlist.o 			\
@@ -38,8 +38,8 @@
 
 ALL_OBJECTS	= $(COMMON_OBJECTS) $(GRAPHIC_OBJECTS) $(OBJECTS) $(MOC_OBJECTS)
 
-LFLAGS		= -lqt -L$(QTDIRECTORY)/lib
-CPPFLAGS	= -g -Wall -Werror -Wpointer-arith -Wbad-function-cast -I$(QTDIRECTORY)/include -I/usr/X11R6/include
+LFLAGS		= -lqt -L/usr/X11R6/lib
+CPPFLAGS	= $(OPT_FLAGS) -Wall -Wpointer-arith -Wbad-function-cast -I/usr/X11R6/include/qt -I/usr/X11R6/include
 TARGET		= freelords
 
 # Important pattern rule for making moc files :)
Commit	Line	Data
7b8197c5 AM	1	diff -urN freelords.org/src/Makefile freelords/src/Makefile
	2	--- freelords.org/src/Makefile Sat Feb 17 15:11:25 2001
	3	+++ freelords/src/Makefile Sat Feb 17 15:23:13 2001
	4	@@ -4,7 +4,7 @@
	5
	6	CXX = g++
	7	QTDIRECTORY = $(QTDIR)
	8	-MOC = $(QTDIRECTORY)/bin/moc
	9	+MOC = /usr/X11R6/bin/moc
	10
	11	COMMON_OBJECTS = common/mapdef.o common/army.o common/citylist.o \
	12	common/stacklist.o common/ruinlist.o \
	13	@@ -38,8 +38,8 @@
	14
	15	ALL_OBJECTS = $(COMMON_OBJECTS) $(GRAPHIC_OBJECTS) $(OBJECTS) $(MOC_OBJECTS)
	16
	17	-LFLAGS = -lqt -L$(QTDIRECTORY)/lib
	18	-CPPFLAGS = -g -Wall -Werror -Wpointer-arith -Wbad-function-cast -I$(QTDIRECTORY)/include -I/usr/X11R6/include
	19	+LFLAGS = -lqt -L/usr/X11R6/lib
	20	+CPPFLAGS = $(OPT_FLAGS) -Wall -Wpointer-arith -Wbad-function-cast -I/usr/X11R6/include/qt -I/usr/X11R6/include
	21	TARGET = freelords
	22
	23	# Important pattern rule for making moc files :)