]>
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 | ||
57 | --- doomlegacy_src/makefile.orig Sat Feb 22 21:07:58 2003 | |
58 | +++ doomlegacy_src/makefile Sat Feb 22 21:11:27 2003 | |
59 | @@ -471,7 +471,7 @@ | |
60 | ||
61 | # build with profiling information | |
62 | ifdef PGCC | |
63 | - CFLAGS = -g -pg -DPARANOIA -fwritable-strings $(OPTS) | |
64 | + CFLAGS = $(OPTS) $(OPTFLAGS) -ffast-math -fomit-frame-pointer -fwritable-strings | |
65 | else | |
66 | CFLAGS = -g -pg -m486 -O3 -ffast-math -fwritable-strings $(OPTS) | |
67 | endif | |
68 | @@ -644,7 +644,7 @@ | |
69 | ||
70 | #dll | |
71 | dll : $(O)/r_opengl.o $(O)/ogl_x11.o | |
72 | - $(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 | |
73 | + $(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 -lGL -lX11 -lXext -lGLU -lm | |
74 | ||
75 | musserv: | |
76 | @mkdir -p $(MUSSERV)/linux | |
77 | @@ -658,7 +658,7 @@ | |
78 | ||
79 | ifdef LINUX | |
80 | $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h | |
81 | - $(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 | |
82 | + $(CC) $(OPTFLAGS) -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX -DPOLL_POINTER -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c | |
83 | endif | |
84 | ||
85 | ifdef SDL | |
86 | @@ -681,7 +681,7 @@ | |
87 | $(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 | |
88 | else | |
89 | $(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h | |
90 | - $(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 | |
91 | + $(CC) $(OPTFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DPOLL_POINTER -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c | |
92 | endif | |
93 | ||
94 |