1 --- doomlegacy_src/linux_x/musserv/Makefile.linux.orig Sat Feb 22 21:12:31 2003
2 +++ doomlegacy_src/linux_x/musserv/Makefile.linux Sat Feb 22 21:12:52 2003
7 -CFLAGS = -I. -Wall -O2 -m486
8 +CFLAGS = -I. -Wall $(OPTFLAGS)
12 --- doomlegacy_src/linux_x/sndserv/Makefile.orig Sat Feb 22 21:11:50 2003
13 +++ doomlegacy_src/linux_x/sndserv/Makefile Sat Feb 22 21:12:12 2003
18 -CFLAGS=-O2 -m486 -Wall -DNORMALUNIX -DLINUX
19 +CFLAGS=$(OPTFLAGS) -Wall -DNORMALUNIX -DLINUX
21 CFLAGS:=${CFLAGS} -DFREEBSD
23 --- doomlegacy_src/tools/makefile.orig Sat Feb 22 21:13:11 2003
24 +++ doomlegacy_src/tools/makefile Sat Feb 22 21:14:30 2003
28 - gcc -O6 -mpentium -Wall -s dircomp2.c -o dircomp2.exe
29 + gcc $(OPTFLAGS) -Wall -s dircomp2.c -o dircomp2.exe
32 - gcc -O6 -mpentium -Wall -g dircomp2.c -o tmp.exe
33 + gcc $(OPTFLAGS) -Wall -g dircomp2.c -o tmp.exe
34 objdump -dS tmp.exe --debugging --no-show-raw-insn > dircomp2.s
38 - gcc -O6 -mpentium -Wall -s h2d.c -o h2d.exe
39 + gcc $(OPTFLAGS) -Wall -s h2d.c -o h2d.exe
42 - gcc -O6 -mpentium -Wall -s dckconv.c -o dckconv.exe
43 + gcc $(OPTFLAGS) -Wall -s dckconv.c -o dckconv.exe
46 - gcc -O6 -mpentium -Wall -s dckconv2.c -o dckconv2.exe
47 + gcc $(OPTFLAGS) -Wall -s dckconv2.c -o dckconv2.exe
50 - gcc -O6 -mpentium -Wall -s dckcomp.c -o dckcomp.exe
51 + gcc $(OPTFLAGS) -Wall -s dckcomp.c -o dckcomp.exe
54 - gcc -O6 -mpentium -Wall -s convert.c -o convert.exe
55 + gcc $(OPTFLAGS) -Wall -s convert.c -o convert.exe
57 --- doomlegacy_src/makefile.orig Thu Feb 27 00:30:58 2003
58 +++ doomlegacy_src/makefile Thu Feb 27 00:34:37 2003
66 OBJS=$(O)/i_video.o $(O)/vid_vesa.o
70 # build with profiling information
72 - CFLAGS = -g -pg -DPARANOIA -fwritable-strings $(OPTS)
73 + CFLAGS = -g -pg $(OPTFLAGS) -DPARANOIA -fwritable-strings $(OPTS)
75 - CFLAGS = -g -pg -m486 -O3 -ffast-math -fwritable-strings $(OPTS)
76 + CFLAGS = -g -pg $(OPTFLAGS) -ffast-math -fwritable-strings $(OPTS)
78 LDFLAGS = -g -pg -L/usr/X11R6/lib
82 # build a normal optimised version
84 - CFLAGS = $(OPTS) -mpentium -O6 -ffast-math -fomit-frame-pointer -fwritable-strings
85 + CFLAGS = $(OPTS) $(OPTFLAGS) -ffast-math -fwritable-strings
86 # -fgcse -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -ffunction-cse \
87 # -fexpensive-optimizations -fforce-mem -fstrength-reduce -fthread-jumps \
88 # -fregmove -fschedule-insns -fschedule-insns2 -fmove-all-movables \
89 # -fcaller-saves -finline-functions -mieee-fp -mfp-ret-in-387 -m80387 -mhard-float -finline
91 - CFLAGS = -m486 -O3 -ffast-math -fomit-frame-pointer -fwritable-strings $(OPTS)
92 + CFLAGS = $(OPTFLAGS) -ffast-math -fwritable-strings $(OPTS)
99 dll : $(O)/r_opengl.o $(O)/ogl_x11.o
100 - $(CC) -mpentium -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
101 + $(CC) $(OPTFLAGS) -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
104 @mkdir -p $(MUSSERV)/linux
108 $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
109 - $(CC) -mpentium -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
110 + $(CC) $(OPTFLAGS) -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
114 @@ -672,16 +672,16 @@
115 $(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
117 $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
118 - $(CC) -mpentium -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
119 + $(CC) $(OPTFLAGS) -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
124 $(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
125 - $(CC) -mpentium -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
126 + $(CC) $(OPTFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
128 $(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
129 - $(CC) -mpentium -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
130 + $(CC) $(OPTFLAGS) -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