[packages/doomlegacy.git] / doomlegacy-Makefile.patch

--- doomlegacy-1.42/doomlegacy_142_src/linux_x/musserv/Makefile.linux.orig	Sat Feb 22 21:12:31 2003
+++ doomlegacy-1.42/doomlegacy_142_src/linux_x/musserv/Makefile.linux	Sat Feb 22 21:12:52 2003
@@ -3,7 +3,7 @@
 #
 
 CC	= gcc
-CFLAGS	= -I. -Wall -O2 -m486
+CFLAGS = -I. -Wall $(OPTFLAGS)
 LDFLAGS	=
 #LDFLAGS	= -static
 
--- doomlegacy-1.42/doomlegacy_142_src/linux_x/sndserv/Makefile.orig	Sat Feb 22 21:11:50 2003
+++ doomlegacy-1.42/doomlegacy_142_src/linux_x/sndserv/Makefile	Sat Feb 22 21:12:12 2003
@@ -22,7 +22,7 @@
 #
 
 CC=gcc
-CFLAGS=-O2 -m486 -Wall -DNORMALUNIX -DLINUX
+CFLAGS=$(OPTFLAGS) -Wall -DNORMALUNIX -DLINUX
 ifdef FREEBSD
 CFLAGS:=${CFLAGS} -DFREEBSD
 endif
--- doomlegacy-1.42/doomlegacy_142_src/tools/makefile.orig	Sat Feb 22 21:13:11 2003
+++ doomlegacy-1.42/doomlegacy_142_src/tools/makefile	Sat Feb 22 21:14:30 2003
@@ -1,24 +1,24 @@
 
 default:    dircomp2.c
-	gcc -O6 -mpentium -Wall -s dircomp2.c -o dircomp2.exe
+	$(CC) $(OPTFLAGS) -Wall dircomp2.c -o dircomp2.exe
 
 asm:
-	gcc -O6 -mpentium -Wall -g dircomp2.c -o tmp.exe
+	$(CC) $(OPTFLAGS) -Wall -g dircomp2.c -o tmp.exe
 	objdump  -dS tmp.exe --debugging --no-show-raw-insn > dircomp2.s
 	del tmp.exe
 
 h2d:	 h2d.c
-	gcc -O6 -mpentium -Wall -s h2d.c -o h2d.exe
+	$(CC) $(OPTFLAGS) -Wall h2d.c -o h2d.exe
 
 dckconv:     dckconv.c
-	gcc -O6 -mpentium -Wall -s dckconv.c -o dckconv.exe
+	$(CC) $(OPTFLAGS) -Wall dckconv.c -o dckconv.exe
 
 dckconv2:     dckconv2.c
-	gcc -O6 -mpentium -Wall -s dckconv2.c -o dckconv2.exe
+	$(CC) $(OPTFLAGS) -Wall dckconv2.c -o dckconv2.exe
 
 dckcomp:     dckcomp.c
-	gcc -O6 -mpentium -Wall -s dckcomp.c -o dckcomp.exe
+	$(CC) $(OPTFLAGS) -Wall dckcomp.c -o dckcomp.exe
 
 convert:    convert.c
-	gcc -O6 -mpentium -Wall -s convert.c -o convert.exe
+	$(CC) $(OPTFLAGS) -Wall convert.c -o convert.exe
 	
--- doomlegacy-1.42/doomlegacy_142_src/makefile.orig	2004-04-18 23:02:24.000000000 +0200
+++ doomlegacy-1.42/doomlegacy_142_src/makefile	2006-10-23 15:55:16.780971750 +0200
@@ -328,7 +328,7 @@
 
 	SFLAGS=
 
-    CFLAGS=-g
+    CFLAGS=
 
 	OBJS=$(O)/i_video.o $(O)/vid_vesa.o
 
@@ -353,8 +353,7 @@
 
 	ifdef X
 
-	    OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I. -I/usr/X11R6/include
-	    LDFLAGS=-L/usr/X11R6/lib
+	    OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I.
 	    LIBS=-lXext -lX11 -lm -ldl -lXxf86vm
 	    ifdef WITH_DGA
 		OPTS += -DWITH_DGA
@@ -405,8 +404,7 @@
 
 	ifdef X
 
-	    OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I. -I/usr/X11R6/include
-	    LDFLAGS=-L/usr/X11R6/lib
+	    OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I.
 	    LIBS=-lXext -lX11 -lm -lXxf86vm -lipx -lkvm -pthread
 	    # name of the exefile
 	    EXENAME=llxdoom
@@ -490,9 +488,8 @@
 		 $(O)/r_opengl.o $(O)/ogl_sdl.o $(O)/hwsym_sdl.o
 
 	DEBUGLIBS=$(LIBS)
-	OPTS := -DLINUX -DHWRENDER -DDIRECTFULLSCREEN -DHAVE_MIXER -DSDL -DVID_X11 $(POLL_POINTER) -I. -I/usr/local/include/SDL -I/usr/X11R6/include -Wall
+	OPTS := -DLINUX -DHWRENDER -DDIRECTFULLSCREEN -DHAVE_MIXER -DSDL -DVID_X11 $(POLL_POINTER) -I. -Wall
 
-	LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib
 	LIBS=-lm -lSDL -lSDL_mixer -lpthread -lGL -lGLU
 	DEBUGLIBS=$(LIBS)
 
@@ -545,23 +542,23 @@
 
 	# build with profiling information
 	ifdef PGCC
-		CFLAGS = -g -pg -DPARANOIA -fwritable-strings $(OPTS)
+		CFLAGS = -g -pg $(OPTFLAGS) -DPARANOIA $(OPTS)
 	else
-		CFLAGS = -g -pg $(M4) -O3 -ffast-math -fwritable-strings $(OPTS)
+		CFLAGS = -g -pg $(OPTFLAGS) -ffast-math $(OPTS)
 	endif
-	LDFLAGS = -g -pg -L/usr/X11R6/lib
+	LDFLAGS = -g -pg
 else
 
 
 	# build a normal optimised version
 	ifdef PGCC
-		CFLAGS = $(OPTS) $(M5) -O6 -ffast-math -fomit-frame-pointer -fwritable-strings
+		CFLAGS = $(OPTS) $(OPTFLAGS) -ffast-math
 		# -fgcse -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -ffunction-cse \
 		# -fexpensive-optimizations -fforce-mem -fstrength-reduce -fthread-jumps  \
 		# -fregmove -fschedule-insns -fschedule-insns2 -fmove-all-movables \
 		# -fcaller-saves -finline-functions -mieee-fp -mfp-ret-in-387 -m80387 -mhard-float -finline
 	else
-		CFLAGS = $(M4) -O3 -ffast-math -fomit-frame-pointer -fwritable-strings $(OPTS)
+		CFLAGS = $(OPTFLAGS) -ffast-math $(OPTS)
 	endif
 endif
 
@@ -735,7 +732,7 @@
 
 #dll
 dll : $(O)/r_opengl.o $(O)/ogl_x11.o
-	$(CC) $(M5) -O6 -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lGLU -lm
+	$(CC) $(OPTFLAGS) -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -lX11 -lXext -lGL -lGLU -lm
 
 musserv:
 	@mkdir -p $(MUSSERV)/linux
@@ -749,12 +746,12 @@
 
 ifdef LINUX
 $(O)/r_opengl.o:	hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
-	$(CC) $(M5) -O6 -o $(O)/r_opengl.o	-DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
+	$(CC) $(OPTFLAGS) -o $(O)/r_opengl.o	-DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/r_opengl.c
 endif
 
 ifdef SDL
 $(O)/r_opengl.o:	hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
-	$(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -c $< -o $@
 endif
 
 ifdef FREEBSD
@@ -763,7 +760,7 @@
 	$(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
 else  #FBSD_SDL
 $(O)/r_opengl.o:	hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
-	$(CC) $(M5) -O6 -o $(O)/r_opengl.o	-DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
+	$(CC) $(OPTFLAGS) -o $(O)/r_opengl.o	-DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/r_opengl.c
 endif #FBSD_SDL
 endif #FREEBSD
 
@@ -774,10 +771,10 @@
 
 ifndef FREEBSD
 $(O)/ogl_x11.o:  hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
-	$(CC) $(M5) -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
+	$(CC) $(OPTFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/ogl_x11.c
 else
 $(O)/ogl_x11.o:  hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
-	$(CC) $(M5) -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
+	$(CC) $(OPTFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/ogl_x11.c
 endif
Commit	Line	Data
ea6b87e7	1	--- doomlegacy-1.42/doomlegacy_142_src/linux_x/musserv/Makefile.linux.orig Sat Feb 22 21:12:31 2003
ea6b87e7	2	+++ doomlegacy-1.42/doomlegacy_142_src/linux_x/musserv/Makefile.linux Sat Feb 22 21:12:52 2003
05d2e936	3	@@ -3,7 +3,7 @@
	4	#
	5
	6	CC = gcc
	7	-CFLAGS = -I. -Wall -O2 -m486
	8	+CFLAGS = -I. -Wall $(OPTFLAGS)
	9	LDFLAGS =
	10	#LDFLAGS = -static
	11
ea6b87e7	12	--- doomlegacy-1.42/doomlegacy_142_src/linux_x/sndserv/Makefile.orig Sat Feb 22 21:11:50 2003
ea6b87e7	13	+++ doomlegacy-1.42/doomlegacy_142_src/linux_x/sndserv/Makefile Sat Feb 22 21:12:12 2003
05d2e936	14	@@ -22,7 +22,7 @@
	15	#
	16
	17	CC=gcc
	18	-CFLAGS=-O2 -m486 -Wall -DNORMALUNIX -DLINUX
	19	+CFLAGS=$(OPTFLAGS) -Wall -DNORMALUNIX -DLINUX
	20	ifdef FREEBSD
	21	CFLAGS:=${CFLAGS} -DFREEBSD
	22	endif
ea6b87e7	23	--- doomlegacy-1.42/doomlegacy_142_src/tools/makefile.orig Sat Feb 22 21:13:11 2003
ea6b87e7	24	+++ doomlegacy-1.42/doomlegacy_142_src/tools/makefile Sat Feb 22 21:14:30 2003
05d2e936	25	@@ -1,24 +1,24 @@
	26
	27	default: dircomp2.c
	28	- gcc -O6 -mpentium -Wall -s dircomp2.c -o dircomp2.exe
5a06e1b6	29	+ $(CC) $(OPTFLAGS) -Wall dircomp2.c -o dircomp2.exe
05d2e936	30
	31	asm:
	32	- gcc -O6 -mpentium -Wall -g dircomp2.c -o tmp.exe
5a06e1b6	33	+ $(CC) $(OPTFLAGS) -Wall -g dircomp2.c -o tmp.exe
05d2e936	34	objdump -dS tmp.exe --debugging --no-show-raw-insn > dircomp2.s
	35	del tmp.exe
	36
	37	h2d: h2d.c
	38	- gcc -O6 -mpentium -Wall -s h2d.c -o h2d.exe
5a06e1b6	39	+ $(CC) $(OPTFLAGS) -Wall h2d.c -o h2d.exe
05d2e936	40
	41	dckconv: dckconv.c
	42	- gcc -O6 -mpentium -Wall -s dckconv.c -o dckconv.exe
5a06e1b6	43	+ $(CC) $(OPTFLAGS) -Wall dckconv.c -o dckconv.exe
05d2e936	44
	45	dckconv2: dckconv2.c
	46	- gcc -O6 -mpentium -Wall -s dckconv2.c -o dckconv2.exe
5a06e1b6	47	+ $(CC) $(OPTFLAGS) -Wall dckconv2.c -o dckconv2.exe
05d2e936	48
	49	dckcomp: dckcomp.c
	50	- gcc -O6 -mpentium -Wall -s dckcomp.c -o dckcomp.exe
5a06e1b6	51	+ $(CC) $(OPTFLAGS) -Wall dckcomp.c -o dckcomp.exe
05d2e936	52
	53	convert: convert.c
	54	- gcc -O6 -mpentium -Wall -s convert.c -o convert.exe
5a06e1b6	55	+ $(CC) $(OPTFLAGS) -Wall convert.c -o convert.exe
05d2e936	56
5a06e1b6 JB	57	--- doomlegacy-1.42/doomlegacy_142_src/makefile.orig 2004-04-18 23:02:24.000000000 +0200
	58	+++ doomlegacy-1.42/doomlegacy_142_src/makefile 2006-10-23 15:55:16.780971750 +0200
	59	@@ -328,7 +328,7 @@
8a8faf9f JB	60
	61	SFLAGS=
	62
	63	- CFLAGS=-g
	64	+ CFLAGS=
	65
	66	OBJS=$(O)/i_video.o $(O)/vid_vesa.o
	67
5a06e1b6 JB	68	@@ -353,8 +353,7 @@
	69
	70	ifdef X
	71
	72	- OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I. -I/usr/X11R6/include
	73	- LDFLAGS=-L/usr/X11R6/lib
	74	+ OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I.
	75	LIBS=-lXext -lX11 -lm -ldl -lXxf86vm
	76	ifdef WITH_DGA
	77	OPTS += -DWITH_DGA
	78	@@ -405,8 +404,7 @@
	79
	80	ifdef X
	81
	82	- OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I. -I/usr/X11R6/include
	83	- LDFLAGS=-L/usr/X11R6/lib
	84	+ OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I.
	85	LIBS=-lXext -lX11 -lm -lXxf86vm -lipx -lkvm -pthread
	86	# name of the exefile
	87	EXENAME=llxdoom
	88	@@ -490,9 +488,8 @@
	89	$(O)/r_opengl.o $(O)/ogl_sdl.o $(O)/hwsym_sdl.o
	90
	91	DEBUGLIBS=$(LIBS)
	92	- OPTS := -DLINUX -DHWRENDER -DDIRECTFULLSCREEN -DHAVE_MIXER -DSDL -DVID_X11 $(POLL_POINTER) -I. -I/usr/local/include/SDL -I/usr/X11R6/include -Wall
	93	+ OPTS := -DLINUX -DHWRENDER -DDIRECTFULLSCREEN -DHAVE_MIXER -DSDL -DVID_X11 $(POLL_POINTER) -I. -Wall
	94
	95	- LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib
	96	LIBS=-lm -lSDL -lSDL_mixer -lpthread -lGL -lGLU
	97	DEBUGLIBS=$(LIBS)
	98
	99	@@ -545,23 +542,23 @@
05d2e936	100
	101	# build with profiling information
	102	ifdef PGCC
	103	- CFLAGS = -g -pg -DPARANOIA -fwritable-strings $(OPTS)
5a06e1b6	104	+ CFLAGS = -g -pg $(OPTFLAGS) -DPARANOIA $(OPTS)
8a8faf9f	105	else
746b6f37	106	- CFLAGS = -g -pg $(M4) -O3 -ffast-math -fwritable-strings $(OPTS)
5a06e1b6	107	+ CFLAGS = -g -pg $(OPTFLAGS) -ffast-math $(OPTS)
8a8faf9f	108	endif
5a06e1b6 JB	109	- LDFLAGS = -g -pg -L/usr/X11R6/lib
5a06e1b6 JB	110	+ LDFLAGS = -g -pg
8a8faf9f	111	else
5a06e1b6	112
8a8faf9f JB	113
	114	# build a normal optimised version
	115	ifdef PGCC
746b6f37	116	- CFLAGS = $(OPTS) $(M5) -O6 -ffast-math -fomit-frame-pointer -fwritable-strings
5a06e1b6	117	+ CFLAGS = $(OPTS) $(OPTFLAGS) -ffast-math
8a8faf9f JB	118	# -fgcse -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -ffunction-cse \
	119	# -fexpensive-optimizations -fforce-mem -fstrength-reduce -fthread-jumps \
	120	# -fregmove -fschedule-insns -fschedule-insns2 -fmove-all-movables \
	121	# -fcaller-saves -finline-functions -mieee-fp -mfp-ret-in-387 -m80387 -mhard-float -finline
05d2e936	122	else
746b6f37	123	- CFLAGS = $(M4) -O3 -ffast-math -fomit-frame-pointer -fwritable-strings $(OPTS)
5a06e1b6	124	+ CFLAGS = $(OPTFLAGS) -ffast-math $(OPTS)
05d2e936	125	endif
8a8faf9f JB	126	endif
8a8faf9f JB	127
5a06e1b6	128	@@ -735,7 +732,7 @@
05d2e936	129
	130	#dll
	131	dll : $(O)/r_opengl.o $(O)/ogl_x11.o
746b6f37	132	- $(CC) $(M5) -O6 -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lGLU -lm
5a06e1b6	133	+ $(CC) $(OPTFLAGS) -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -lX11 -lXext -lGL -lGLU -lm
05d2e936	134
	135	musserv:
	136	@mkdir -p $(MUSSERV)/linux
5a06e1b6	137	@@ -749,12 +746,12 @@
05d2e936	138
	139	ifdef LINUX
	140	$(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
746b6f37	141	- $(CC) $(M5) -O6 -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
5a06e1b6	142	+ $(CC) $(OPTFLAGS) -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/r_opengl.c
05d2e936	143	endif
	144
	145	ifdef SDL
5a06e1b6 JB	146	$(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
	147	- $(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
	148	+ $(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -c $< -o $@
	149	endif
	150
	151	ifdef FREEBSD
	152	@@ -763,7 +760,7 @@
8a8faf9f JB	153	$(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
	154	else #FBSD_SDL
	155	$(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
746b6f37	156	- $(CC) $(M5) -O6 -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
5a06e1b6	157	+ $(CC) $(OPTFLAGS) -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/r_opengl.c
8a8faf9f JB	158	endif #FBSD_SDL
	159	endif #FREEBSD
	160
5a06e1b6	161	@@ -774,10 +771,10 @@
746b6f37	162
8a8faf9f JB	163	ifndef FREEBSD
8a8faf9f JB	164	$(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
746b6f37	165	- $(CC) $(M5) -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
5a06e1b6	166	+ $(CC) $(OPTFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/ogl_x11.c
05d2e936	167	else
05d2e936	168	$(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
746b6f37	169	- $(CC) $(M5) -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
5a06e1b6	170	+ $(CC) $(OPTFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/ogl_x11.c
05d2e936	171	endif
	172
	173