1 --- doomlegacy_142_src/linux_x/musserv/Makefile.linux.orig Sat Feb 22 21:12:31 2003
2 +++ doomlegacy_142_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_142_src/linux_x/sndserv/Makefile.orig Sat Feb 22 21:11:50 2003
13 +++ doomlegacy_142_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_142_src/tools/makefile.orig Sat Feb 22 21:13:11 2003
24 +++ doomlegacy_142_src/tools/makefile Sat Feb 22 21:14:30 2003
28 - gcc -O6 -mpentium -Wall -s dircomp2.c -o dircomp2.exe
29 + $(CC) $(OPTFLAGS) -Wall dircomp2.c -o dircomp2.exe
32 - gcc -O6 -mpentium -Wall -g dircomp2.c -o tmp.exe
33 + $(CC) $(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 + $(CC) $(OPTFLAGS) -Wall h2d.c -o h2d.exe
42 - gcc -O6 -mpentium -Wall -s dckconv.c -o dckconv.exe
43 + $(CC) $(OPTFLAGS) -Wall dckconv.c -o dckconv.exe
46 - gcc -O6 -mpentium -Wall -s dckconv2.c -o dckconv2.exe
47 + $(CC) $(OPTFLAGS) -Wall dckconv2.c -o dckconv2.exe
50 - gcc -O6 -mpentium -Wall -s dckcomp.c -o dckcomp.exe
51 + $(CC) $(OPTFLAGS) -Wall dckcomp.c -o dckcomp.exe
54 - gcc -O6 -mpentium -Wall -s convert.c -o convert.exe
55 + $(CC) $(OPTFLAGS) -Wall convert.c -o convert.exe
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
66 OBJS=$(O)/i_video.o $(O)/vid_vesa.o
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
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
89 $(O)/r_opengl.o $(O)/ogl_sdl.o $(O)/hwsym_sdl.o
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
95 - LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib
96 LIBS=-lm -lSDL -lSDL_mixer -lpthread -lGL -lGLU
101 # build with profiling information
103 - CFLAGS = -g -pg -DPARANOIA -fwritable-strings $(OPTS)
104 + CFLAGS = -g -pg $(OPTFLAGS) -DPARANOIA $(OPTS)
106 - CFLAGS = -g -pg $(M4) -O3 -ffast-math -fwritable-strings $(OPTS)
107 + CFLAGS = -g -pg $(OPTFLAGS) -ffast-math $(OPTS)
109 - LDFLAGS = -g -pg -L/usr/X11R6/lib
114 # build a normal optimised version
116 - CFLAGS = $(OPTS) $(M5) -O6 -ffast-math -fomit-frame-pointer -fwritable-strings
117 + CFLAGS = $(OPTS) $(OPTFLAGS) -ffast-math
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
123 - CFLAGS = $(M4) -O3 -ffast-math -fomit-frame-pointer -fwritable-strings $(OPTS)
124 + CFLAGS = $(OPTFLAGS) -ffast-math $(OPTS)
131 dll : $(O)/r_opengl.o $(O)/ogl_x11.o
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
133 + $(CC) $(OPTFLAGS) -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -lX11 -lXext -lGL -lGLU -lm
136 @mkdir -p $(MUSSERV)/linux
137 @@ -749,12 +746,12 @@
140 $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
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
142 + $(CC) $(OPTFLAGS) -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/r_opengl.c
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 $@
153 $(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
155 $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
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
157 + $(CC) $(OPTFLAGS) -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/r_opengl.c
161 @@ -774,10 +771,10 @@
164 $(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
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
166 + $(CC) $(OPTFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/ogl_x11.c
168 $(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
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
170 + $(CC) $(OPTFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/ogl_x11.c