]>
Commit | Line | Data |
---|---|---|
05d2e936 | 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 | |
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 | ||
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 | |
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 | |
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 | |
25 | @@ -1,24 +1,24 @@ | |
26 | ||
27 | default: dircomp2.c | |
28 | - gcc -O6 -mpentium -Wall -s dircomp2.c -o dircomp2.exe | |
29 | + gcc $(OPTFLAGS) -Wall -s dircomp2.c -o dircomp2.exe | |
30 | ||
31 | asm: | |
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 | |
35 | del tmp.exe | |
36 | ||
37 | h2d: h2d.c | |
38 | - gcc -O6 -mpentium -Wall -s h2d.c -o h2d.exe | |
39 | + gcc $(OPTFLAGS) -Wall -s h2d.c -o h2d.exe | |
40 | ||
41 | dckconv: dckconv.c | |
42 | - gcc -O6 -mpentium -Wall -s dckconv.c -o dckconv.exe | |
43 | + gcc $(OPTFLAGS) -Wall -s dckconv.c -o dckconv.exe | |
44 | ||
45 | dckconv2: dckconv2.c | |
46 | - gcc -O6 -mpentium -Wall -s dckconv2.c -o dckconv2.exe | |
47 | + gcc $(OPTFLAGS) -Wall -s dckconv2.c -o dckconv2.exe | |
48 | ||
49 | dckcomp: dckcomp.c | |
50 | - gcc -O6 -mpentium -Wall -s dckcomp.c -o dckcomp.exe | |
51 | + gcc $(OPTFLAGS) -Wall -s dckcomp.c -o dckcomp.exe | |
52 | ||
53 | convert: convert.c | |
54 | - gcc -O6 -mpentium -Wall -s convert.c -o convert.exe | |
55 | + gcc $(OPTFLAGS) -Wall -s convert.c -o convert.exe | |
56 | ||
8a8faf9f JB |
57 | --- doomlegacy_src/makefile.orig Thu Feb 27 00:30:58 2003 |
58 | +++ doomlegacy_src/makefile Thu Feb 27 00:34:37 2003 | |
59 | @@ -298,7 +298,7 @@ | |
60 | ||
61 | SFLAGS= | |
62 | ||
63 | - CFLAGS=-g | |
64 | + CFLAGS= | |
65 | ||
66 | OBJS=$(O)/i_video.o $(O)/vid_vesa.o | |
67 | ||
68 | @@ -471,9 +471,9 @@ | |
05d2e936 | 69 | |
70 | # build with profiling information | |
71 | ifdef PGCC | |
72 | - CFLAGS = -g -pg -DPARANOIA -fwritable-strings $(OPTS) | |
8a8faf9f JB |
73 | + CFLAGS = -g -pg $(OPTFLAGS) -DPARANOIA -fwritable-strings $(OPTS) |
74 | else | |
75 | - CFLAGS = -g -pg -m486 -O3 -ffast-math -fwritable-strings $(OPTS) | |
76 | + CFLAGS = -g -pg $(OPTFLAGS) -ffast-math -fwritable-strings $(OPTS) | |
77 | endif | |
78 | LDFLAGS = -g -pg -L/usr/X11R6/lib | |
79 | else | |
80 | @@ -481,13 +481,13 @@ | |
81 | ||
82 | # build a normal optimised version | |
83 | ifdef PGCC | |
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 | |
05d2e936 | 90 | else |
8a8faf9f JB |
91 | - CFLAGS = -m486 -O3 -ffast-math -fomit-frame-pointer -fwritable-strings $(OPTS) |
92 | + CFLAGS = $(OPTFLAGS) -ffast-math -fwritable-strings $(OPTS) | |
05d2e936 | 93 | endif |
8a8faf9f JB |
94 | endif |
95 | ||
05d2e936 | 96 | @@ -644,7 +644,7 @@ |
97 | ||
98 | #dll | |
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 | |
8a8faf9f | 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 |
05d2e936 | 102 | |
103 | musserv: | |
104 | @mkdir -p $(MUSSERV)/linux | |
105 | @@ -658,7 +658,7 @@ | |
106 | ||
107 | ifdef 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 | |
8a8faf9f | 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 |
05d2e936 | 111 | endif |
112 | ||
113 | ifdef SDL | |
8a8faf9f JB |
114 | @@ -672,16 +672,16 @@ |
115 | $(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@ | |
116 | else #FBSD_SDL | |
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 | |
120 | endif #FBSD_SDL | |
121 | endif #FREEBSD | |
122 | ||
123 | ifndef FREEBSD | |
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 | |
05d2e936 | 127 | else |
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 | |
8a8faf9f | 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 |
05d2e936 | 131 | endif |
132 | ||
133 |