]>
Commit | Line | Data |
---|---|---|
0a49077e ER |
1 | --- doomlegacy-1.44/src/linux_x/musserv/Makefile.linux~ 2009-09-24 08:04:44.000000000 +0300 |
2 | +++ doomlegacy-1.44/src/linux_x/musserv/Makefile.linux 2011-01-20 02:50:42.858632376 +0200 | |
05d2e936 | 3 | @@ -3,7 +3,7 @@ |
4 | # | |
5 | ||
6 | CC = gcc | |
0a49077e ER |
7 | -CFLAGS = -I. -Wall -O2 -march=pentium |
8 | +CFLAGS = -I. -Wall $(OPTFLAGS) | |
05d2e936 | 9 | LDFLAGS = |
10 | #LDFLAGS = -static | |
11 | ||
0a49077e ER |
12 | --- doomlegacy-1.44/src/linux_x/sndserv/Makefile~ 2009-09-24 08:04:44.000000000 +0300 |
13 | +++ doomlegacy-1.44/src/linux_x/sndserv/Makefile 2011-01-20 02:52:40.272020598 +0200 | |
14 | @@ -30,7 +30,7 @@ | |
05d2e936 | 15 | # |
16 | ||
17 | CC=gcc | |
0a49077e | 18 | -CFLAGS=-O2 -march=pentium -Wall -DNORMALUNIX -DLINUX |
05d2e936 | 19 | +CFLAGS=$(OPTFLAGS) -Wall -DNORMALUNIX -DLINUX |
20 | ifdef FREEBSD | |
21 | CFLAGS:=${CFLAGS} -DFREEBSD | |
22 | endif | |
ea6b87e7 | 23 | --- doomlegacy-1.42/doomlegacy_142_src/tools/makefile.orig Sat Feb 22 21:13:11 2003 |
24 | +++ doomlegacy-1.42/doomlegacy_142_src/tools/makefile Sat Feb 22 21:14:30 2003 | |
05d2e936 | 25 | @@ -1,24 +1,24 @@ |
26 | ||
27 | default: dircomp2.c | |
28 | - gcc -O6 -mpentium -Wall -s dircomp2.c -o dircomp2.exe | |
5a06e1b6 | 29 | + $(CC) $(OPTFLAGS) -Wall dircomp2.c -o dircomp2.exe |
05d2e936 | 30 | |
31 | asm: | |
32 | - gcc -O6 -mpentium -Wall -g dircomp2.c -o tmp.exe | |
5a06e1b6 | 33 | + $(CC) $(OPTFLAGS) -Wall -g dircomp2.c -o tmp.exe |
05d2e936 | 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 | |
5a06e1b6 | 39 | + $(CC) $(OPTFLAGS) -Wall h2d.c -o h2d.exe |
05d2e936 | 40 | |
41 | dckconv: dckconv.c | |
42 | - gcc -O6 -mpentium -Wall -s dckconv.c -o dckconv.exe | |
5a06e1b6 | 43 | + $(CC) $(OPTFLAGS) -Wall dckconv.c -o dckconv.exe |
05d2e936 | 44 | |
45 | dckconv2: dckconv2.c | |
46 | - gcc -O6 -mpentium -Wall -s dckconv2.c -o dckconv2.exe | |
5a06e1b6 | 47 | + $(CC) $(OPTFLAGS) -Wall dckconv2.c -o dckconv2.exe |
05d2e936 | 48 | |
49 | dckcomp: dckcomp.c | |
50 | - gcc -O6 -mpentium -Wall -s dckcomp.c -o dckcomp.exe | |
5a06e1b6 | 51 | + $(CC) $(OPTFLAGS) -Wall dckcomp.c -o dckcomp.exe |
05d2e936 | 52 | |
53 | convert: convert.c | |
54 | - gcc -O6 -mpentium -Wall -s convert.c -o convert.exe | |
5a06e1b6 | 55 | + $(CC) $(OPTFLAGS) -Wall convert.c -o convert.exe |
05d2e936 | 56 | |
9c31b396 ER |
57 | --- doomlegacy-1.44/src/Makefile~ 2011-03-13 22:41:25.000000000 +0200 |
58 | +++ doomlegacy-1.44/src/Makefile 2011-03-13 22:41:56.523480247 +0200 | |
7b8f8d39 ER |
59 | @@ -57,6 +57,9 @@ |
60 | OPTLEV = -O3 | |
61 | #OPTLEV = -O5 | |
62 | ||
63 | +# OPTFLAGS together, not just opt level | |
64 | +OPTFLAGS = $(OPTLEV) | |
65 | + | |
66 | # Debug enables, save on reinventing this everytime. | |
67 | #DEBUG=1 | |
68 | #PROFILEMODE=1 | |
69 | @@ -78,6 +81,7 @@ | |
0a49077e ER |
70 | |
71 | # gcc or g++ | |
72 | CC=gcc | |
73 | +CXX=g++ | |
74 | ||
75 | # End of User tunable settings | |
76 | ||
9c31b396 | 77 | @@ -157,8 +157,7 @@ |
0a49077e ER |
78 | X=1 |
79 | ||
80 | ifdef X | |
81 | - OPTS := $(OPTS) $(POLL_POINTER) -I. -I/usr/X11R6/include | |
82 | - LDFLAGS=-L/usr/X11R6/lib | |
83 | + OPTS := $(OPTS) $(POLL_POINTER) -I. | |
9c31b396 | 84 | LIBS=-lGL -lGLU -lXext -lX11 -lm -ldl -lXxf86vm |
0a49077e ER |
85 | |
86 | #WITH_DGA=1 | |
7b8f8d39 | 87 | @@ -202,8 +205,7 @@ |
0a49077e ER |
88 | endif |
89 | ||
90 | ifdef X | |
91 | - OPTS := $(OPTS) $(POLL_POINTER) -I. -I/usr/X11R6/include | |
92 | - LDFLAGS=-L/usr/X11R6/lib | |
93 | + OPTS := $(OPTS) $(POLL_POINTER) -I. | |
94 | LIBS=-lXext -lX11 -lm -lXxf86vm -lipx -lkvm -pthread | |
95 | # name of the exefile | |
96 | EXENAME=llxdoom | |
7b8f8d39 | 97 | @@ -213,7 +215,7 @@ |
0a49077e ER |
98 | $(O)/hw_md2.o $(O)/hw_cache.o $(O)/hw_trick.o |
99 | ||
100 | else #ifdef X | |
101 | - OPTS := $(OPTS) -DVID_GGI -I. -I/usr/local/include | |
102 | + OPTS := $(OPTS) -DVID_GGI -I. | |
103 | LDFLAGS= | |
104 | LIBS=-lggi -lm -lipx | |
105 | # name of the exefile | |
7b8f8d39 | 106 | @@ -294,7 +296,7 @@ |
0a49077e ER |
107 | |
108 | ifdef PROFILEMODE | |
109 | # build with gprof profiling information | |
110 | - CFLAGS += -g -pg -fomit-frame-pointer | |
111 | + CFLAGS += -g -pg | |
8a8faf9f | 112 | else |
0a49077e ER |
113 | ifdef DEBUG |
114 | # No -fomit-frame-pointer because debugging on some machines depends upon it. | |
7b8f8d39 | 115 | @@ -303,7 +305,7 @@ |
0a49077e ER |
116 | else |
117 | # build a normal optimized version | |
118 | #CFLAGS += -O3 | |
119 | - CFLAGS += $(OPTLEV) -fomit-frame-pointer | |
7b8f8d39 | 120 | + CFLAGS += $(OPTFLAGS) |
0a49077e ER |
121 | endif |
122 | endif | |
5a06e1b6 | 123 | |
7b8f8d39 | 124 | @@ -464,13 +466,13 @@ |
8a8faf9f | 125 | |
8a8faf9f | 126 | |
0a49077e ER |
127 | $(BIN)/wadtool: $(O)/wadtool.o $(O)/md5_cpp.o |
128 | - g++ $(LDFLAGS) $^ -o $@ | |
129 | + $(CXX) $(LDFLAGS) $^ -o $@ | |
130 | ||
131 | $(O)/wadtool.o: common/tools/wadtool.cpp | |
132 | - g++ $(CFLAGS) -std=c++0x -c $< -o $@ | |
133 | + $(CXX) $(CFLAGS) -std=c++0x -c $< -o $@ | |
134 | ||
135 | $(O)/md5_cpp.o: md5.c | |
136 | - g++ $(CFLAGS) -std=c++0x -c $< -o $@ | |
137 | + $(CXX) $(CFLAGS) -std=c++0x -c $< -o $@ | |
138 | ||
139 | wad : $(BIN)/wadtool | |
140 | ifdef WAD | |
7b8f8d39 | 141 | @@ -507,7 +509,7 @@ |
05d2e936 | 142 | |
143 | #dll | |
144 | dll : $(O)/r_opengl.o $(O)/ogl_x11.o | |
0a49077e | 145 | - $(CC) -O3 -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 |
5a06e1b6 | 146 | + $(CC) $(OPTFLAGS) -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -lX11 -lXext -lGL -lGLU -lm |
05d2e936 | 147 | |
148 | musserv: | |
149 | @mkdir -p $(MUSSERV)/linux | |
7b8f8d39 | 150 | @@ -533,7 +535,7 @@ |
05d2e936 | 151 | |
5a06e1b6 | 152 | |
05d2e936 | 153 | $(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h |
0a49077e ER |
154 | - $(CC) $(CFLAGS) -shared -nostartfiles -I/usr/X11R6/include -c $< -o $@ |
155 | + $(CC) $(CFLAGS) -shared -nostartfiles -c $< -o $@ | |
05d2e936 | 156 | |
157 | ||
0a49077e | 158 | #======================================================= |