]>
Commit | Line | Data |
---|---|---|
cafc9b26 | 1 | --- doomlegacy/makefile.orig Sun May 6 01:39:28 2001 |
2 | +++ doomlegacy/makefile Sat Jun 30 11:20:55 2001 | |
3 | @@ -366,7 +366,7 @@ | |
4 | \r | |
5 | # build a normal optimised version\r | |
6 | ifdef PGCC\r | |
7 | - CFLAGS = $(OPTS) -mpentium -O6 -ffast-math -fomit-frame-pointer -fwritable-strings\r | |
8 | + CFLAGS = $(OPTS) $(OPTFLAGS) -ffast-math -fomit-frame-pointer -fwritable-strings\r | |
9 | # -fgcse -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -ffunction-cse \\r | |
10 | # -fexpensive-optimizations -fforce-mem -fstrength-reduce -fthread-jumps \\r | |
11 | # -fregmove -fschedule-insns -fschedule-insns2 -fmove-all-movables \\r | |
12 | @@ -506,7 +506,7 @@ | |
13 | \r | |
14 | #dll\r | |
15 | dll : $(O)/r_opengl.o $(O)/ogl_x11.o\r | |
16 | - $(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 -lGL -lX11 -lXext -lGLU -lm\r | |
17 | + $(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\r | |
18 | \r | |
19 | musserv:\r | |
20 | @mkdir -p $(MUSSERV)/linux\r | |
21 | @@ -520,7 +520,7 @@ | |
22 | \r | |
23 | ifdef LINUX\r | |
24 | $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h\r | |
25 | - $(CC) -mpentium -O6 -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX -DPOLL_POINTER -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c\r | |
26 | + $(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\r | |
27 | endif\r | |
28 | \r | |
29 | ifdef SDL\r | |
30 | @@ -529,7 +529,7 @@ | |
31 | endif\r | |
32 | \r | |
33 | $(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h\r | |
34 | - $(CC) -mpentium -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DPOLL_POINTER -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c\r | |
35 | + $(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\r | |
36 | \r | |
37 | \r | |
38 | #dependecy made by gcc itself ! (see makedep.mak for more)\r | |
39 | --- doomlegacy/linux_x/sndserv/Makefile.orig Sun Apr 30 21:50:38 2000 | |
40 | +++ doomlegacy/linux_x/sndserv/Makefile Sat Jun 30 11:20:08 2001 | |
41 | @@ -19,7 +19,7 @@ | |
42 | #\r | |
43 | \r | |
44 | CC=gcc\r | |
45 | -CFLAGS=-O2 -m486 -Wall -DNORMALUNIX -DLINUX\r | |
46 | +CFLAGS=$(OPTFLAGS) -Wall -DNORMALUNIX -DLINUX\r | |
47 | LDFLAGS=\r | |
48 | LIBS=-lm\r | |
49 | \r | |
50 | --- doomlegacy/linux_x/musserv/Makefile.linux.orig Sun Feb 27 01:42:12 2000 | |
51 | +++ doomlegacy/linux_x/musserv/Makefile.linux Sat Jun 30 11:20:08 2001 | |
52 | @@ -3,7 +3,7 @@ | |
53 | #\r | |
54 | \r | |
55 | CC = gcc\r | |
56 | -CFLAGS = -I. -Wall -O2 -m486\r | |
57 | +CFLAGS = -I. -Wall $(OPTFLAGS)\r | |
58 | LDFLAGS =\r | |
59 | #LDFLAGS = -static\r | |
60 | \r | |
61 | --- doomlegacy/tools/makefile.orig Thu Jan 25 23:15:46 2001 | |
62 | +++ doomlegacy/tools/makefile Sat Jun 30 11:20:08 2001 | |
63 | @@ -1,24 +1,24 @@ | |
64 | \r | |
65 | default: dircomp2.c\r | |
66 | - gcc -O6 -mpentium -Wall -s dircomp2.c -o dircomp2.exe\r | |
67 | + gcc $(OPTFLAGS) -Wall -s dircomp2.c -o dircomp2.exe\r | |
68 | \r | |
69 | asm:\r | |
70 | - gcc -O6 -mpentium -Wall -g dircomp2.c -o tmp.exe\r | |
71 | + gcc $(OPTFLAGS) -Wall -g dircomp2.c -o tmp.exe\r | |
72 | objdump -dS tmp.exe --debugging --no-show-raw-insn > dircomp2.s\r | |
73 | del tmp.exe\r | |
74 | \r | |
75 | h2d: h2d.c\r | |
76 | - gcc -O6 -mpentium -Wall -s h2d.c -o h2d.exe\r | |
77 | + gcc $(OPTFLAGS) -Wall -s h2d.c -o h2d.exe\r | |
78 | \r | |
79 | dckconv: dckconv.c\r | |
80 | - gcc -O6 -mpentium -Wall -s dckconv.c -o dckconv.exe\r | |
81 | + gcc $(OPTFLAGS) -Wall -s dckconv.c -o dckconv.exe\r | |
82 | \r | |
83 | dckconv2: dckconv2.c\r | |
84 | - gcc -O6 -mpentium -Wall -s dckconv2.c -o dckconv2.exe\r | |
85 | + gcc $(OPTFLAGS) -Wall -s dckconv2.c -o dckconv2.exe\r | |
86 | \r | |
87 | dckcomp: dckcomp.c\r | |
88 | - gcc -O6 -mpentium -Wall -s dckcomp.c -o dckcomp.exe\r | |
89 | + gcc $(OPTFLAGS) -Wall -s dckcomp.c -o dckcomp.exe\r | |
90 | \r | |
91 | convert: convert.c\r | |
92 | - gcc -O6 -mpentium -Wall -s convert.c -o convert.exe\r | |
93 | - \r | |
94 | + gcc $(OPTFLAGS) -Wall -s convert.c -o convert.exe\r | |
95 | +\r |