|
Lines 1-14
Link Here
|
| 1 |
--- Makefile.orig Tue Nov 28 19:05:39 2006 |
1 |
--- Makefile.orig Sun Apr 1 19:55:18 2007 |
| 2 |
+++ Makefile Tue Dec 26 00:19:11 2006 |
2 |
+++ Makefile Tue Sep 11 17:29:50 2007 |
| 3 |
@@ -26,11 +26,19 @@ |
3 |
@@ -27,16 +27,21 @@ |
| 4 |
endif |
4 |
endif |
| 5 |
endif |
5 |
endif |
| 6 |
|
6 |
|
| 7 |
-BUILD_CLIENT = |
7 |
-BUILD_CLIENT =1 |
| 8 |
-BUILD_CLIENT_SMP = |
8 |
-BUILD_CLIENT_SMP =0 |
| 9 |
-BUILD_SERVER = |
9 |
-BUILD_SERVER =1 |
| 10 |
-BUILD_GAME_SO = |
10 |
-BUILD_GAME_SO =0 |
| 11 |
-BUILD_GAME_QVM = |
11 |
-BUILD_GAME_QVM =0 |
|
|
12 |
-OPTIMIZE =1 |
| 13 |
-USE_SDL =1 |
| 14 |
-USE_OPENAL =0 |
| 15 |
-USE_CURL =1 |
| 16 |
-USE_CODEC_VORBIS =0 |
| 12 |
+BUILD_CLIENT?=0 |
17 |
+BUILD_CLIENT?=0 |
| 13 |
+BUILD_CLIENT_SMP?=0 |
18 |
+BUILD_CLIENT_SMP?=0 |
| 14 |
+BUILD_GAME_QVM?=0 |
19 |
+BUILD_GAME_QVM?=0 |
|
Lines 16-21
Link Here
|
| 16 |
+BUILD_SERVER?=0 |
21 |
+BUILD_SERVER?=0 |
| 17 |
+HAVE_VM_COMPILED?=false |
22 |
+HAVE_VM_COMPILED?=false |
| 18 |
+USE_CODEC_VORBIS?=0 |
23 |
+USE_CODEC_VORBIS?=0 |
|
|
24 |
+USE_CURL?=0 |
| 25 |
+USE_CURL_DLOPEN?=0 |
| 19 |
+USE_LOCAL_HEADERS?=0 |
26 |
+USE_LOCAL_HEADERS?=0 |
| 20 |
+USE_OPENAL?=0 |
27 |
+USE_OPENAL?=0 |
| 21 |
+USE_OPENAL_DLOPEN?=0 |
28 |
+USE_OPENAL_DLOPEN?=0 |
|
Lines 25-38
Link Here
|
| 25 |
|
32 |
|
| 26 |
############################################################################# |
33 |
############################################################################# |
| 27 |
# |
34 |
# |
| 28 |
@@ -88,30 +96,10 @@ |
35 |
@@ -98,38 +103,10 @@ |
|
|
36 |
USE_SDL=1 |
| 29 |
endif |
37 |
endif |
| 30 |
export USE_CCACHE |
|
|
| 31 |
|
38 |
|
| 32 |
-ifndef USE_SDL |
|
|
| 33 |
-USE_SDL=1 |
| 34 |
-endif |
| 35 |
- |
| 36 |
-ifndef USE_OPENAL |
39 |
-ifndef USE_OPENAL |
| 37 |
-USE_OPENAL=1 |
40 |
-USE_OPENAL=1 |
| 38 |
-endif |
41 |
-endif |
|
Lines 41-46
Link Here
|
| 41 |
-USE_OPENAL_DLOPEN=0 |
44 |
-USE_OPENAL_DLOPEN=0 |
| 42 |
-endif |
45 |
-endif |
| 43 |
- |
46 |
- |
|
|
47 |
-ifndef USE_CURL |
| 48 |
-USE_CURL=1 |
| 49 |
-endif |
| 50 |
- |
| 51 |
-ifndef USE_CURL_DLOPEN |
| 52 |
- ifeq ($(PLATFORM),mingw32) |
| 53 |
- USE_CURL_DLOPEN=0 |
| 54 |
- else |
| 55 |
- USE_CURL_DLOPEN=1 |
| 56 |
- endif |
| 57 |
-endif |
| 58 |
- |
| 44 |
-ifndef USE_CODEC_VORBIS |
59 |
-ifndef USE_CODEC_VORBIS |
| 45 |
-USE_CODEC_VORBIS=0 |
60 |
-USE_CODEC_VORBIS=0 |
| 46 |
-endif |
61 |
-endif |
|
Lines 57-63
Link Here
|
| 57 |
CDIR=$(MOUNT_DIR)/client |
72 |
CDIR=$(MOUNT_DIR)/client |
| 58 |
SDIR=$(MOUNT_DIR)/server |
73 |
SDIR=$(MOUNT_DIR)/server |
| 59 |
RDIR=$(MOUNT_DIR)/renderer |
74 |
RDIR=$(MOUNT_DIR)/renderer |
| 60 |
@@ -444,18 +432,12 @@ |
75 |
@@ -504,18 +481,12 @@ |
| 61 |
|
76 |
|
| 62 |
ifeq ($(PLATFORM),freebsd) |
77 |
ifeq ($(PLATFORM),freebsd) |
| 63 |
|
78 |
|
|
Lines 79-85
Link Here
|
| 79 |
|
94 |
|
| 80 |
ifeq ($(USE_OPENAL),1) |
95 |
ifeq ($(USE_OPENAL),1) |
| 81 |
BASE_CFLAGS += -DUSE_OPENAL=1 |
96 |
BASE_CFLAGS += -DUSE_OPENAL=1 |
| 82 |
@@ -468,47 +450,61 @@ |
97 |
@@ -528,47 +499,61 @@ |
| 83 |
BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 |
98 |
BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 |
| 84 |
endif |
99 |
endif |
| 85 |
|
100 |
|
|
Lines 110-116
Link Here
|
| 110 |
- BASE_CFLAGS += -DNO_VM_COMPILED |
125 |
- BASE_CFLAGS += -DNO_VM_COMPILED |
| 111 |
+ ifeq ($(USE_SDL_AUDIO),1) |
126 |
+ ifeq ($(USE_SDL_AUDIO),1) |
| 112 |
+ BASE_CFLAGS += -DUSE_SDL_SOUND=1 |
127 |
+ BASE_CFLAGS += -DUSE_SDL_SOUND=1 |
| 113 |
+ endif |
128 |
endif |
| 114 |
+ |
129 |
+ |
| 115 |
+ ifeq ($(USE_SDL_VIDEO),1) |
130 |
+ ifeq ($(USE_SDL_VIDEO),1) |
| 116 |
+ BASE_CFLAGS += -DUSE_SDL_VIDEO=1 |
131 |
+ BASE_CFLAGS += -DUSE_SDL_VIDEO=1 |
|
Lines 123-129
Link Here
|
| 123 |
+ RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 \ |
138 |
+ RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 \ |
| 124 |
+ -fstrength-reduce |
139 |
+ -fstrength-reduce |
| 125 |
+ endif |
140 |
+ endif |
| 126 |
endif |
141 |
+ endif |
| 127 |
+ |
142 |
+ |
| 128 |
+ ifneq ($(HAVE_VM_COMPILED),true) |
143 |
+ ifneq ($(HAVE_VM_COMPILED),true) |
| 129 |
+ BASE_CFLAGS += -DNO_VM_COMPILED |
144 |
+ BASE_CFLAGS += -DNO_VM_COMPILED |
|
Lines 164-170
Link Here
|
| 164 |
endif |
179 |
endif |
| 165 |
endif |
180 |
endif |
| 166 |
|
181 |
|
| 167 |
@@ -516,7 +512,6 @@ |
182 |
@@ -576,7 +561,6 @@ |
| 168 |
CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg |
183 |
CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg |
| 169 |
endif |
184 |
endif |
| 170 |
|
185 |
|
|
Lines 172-195
Link Here
|
| 172 |
else # ifeq freebsd |
187 |
else # ifeq freebsd |
| 173 |
|
188 |
|
| 174 |
############################################################################# |
189 |
############################################################################# |
| 175 |
@@ -670,24 +665,25 @@ |
190 |
@@ -731,24 +715,25 @@ |
| 176 |
TARGETS = |
191 |
TARGETS = |
| 177 |
|
192 |
|
| 178 |
ifneq ($(BUILD_SERVER),0) |
193 |
ifneq ($(BUILD_SERVER),0) |
| 179 |
- TARGETS += $(B)/ioq3ded.$(ARCH)$(BINEXT) |
194 |
- TARGETS += $(B)/ioUrTded.$(ARCH)$(BINEXT) |
| 180 |
+ TARGETS += $(B)/ioq3ded$(BINEXT) |
195 |
+ TARGETS += $(B)/ioUrTded$(BINEXT) |
| 181 |
endif |
196 |
endif |
| 182 |
|
197 |
|
| 183 |
ifneq ($(BUILD_CLIENT),0) |
198 |
ifneq ($(BUILD_CLIENT),0) |
| 184 |
- TARGETS += $(B)/ioquake3.$(ARCH)$(BINEXT) |
199 |
- TARGETS += $(B)/ioUrbanTerror.$(ARCH)$(BINEXT) |
| 185 |
- ifneq ($(BUILD_CLIENT_SMP),0) |
200 |
- ifneq ($(BUILD_CLIENT_SMP),0) |
| 186 |
- TARGETS += $(B)/ioquake3-smp.$(ARCH)$(BINEXT) |
201 |
- TARGETS += $(B)/ioUrbanTerror-smp.$(ARCH)$(BINEXT) |
| 187 |
- endif |
202 |
- endif |
| 188 |
+ TARGETS += $(B)/ioquake3$(BINEXT) |
203 |
+ TARGETS += $(B)/ioUrbanTerror$(BINEXT) |
| 189 |
+endif |
204 |
+endif |
| 190 |
+ |
205 |
+ |
| 191 |
+ifneq ($(BUILD_CLIENT_SMP),0) |
206 |
+ifneq ($(BUILD_CLIENT_SMP),0) |
| 192 |
+ TARGETS += $(B)/ioquake3-smp$(BINEXT) |
207 |
+ TARGETS += $(B)/ioUrbanTerror-smp$(BINEXT) |
| 193 |
endif |
208 |
endif |
| 194 |
|
209 |
|
| 195 |
ifneq ($(BUILD_GAME_SO),0) |
210 |
ifneq ($(BUILD_GAME_SO),0) |
|
Lines 209-215
Link Here
|
| 209 |
endif |
224 |
endif |
| 210 |
|
225 |
|
| 211 |
ifneq ($(BUILD_GAME_QVM),0) |
226 |
ifneq ($(BUILD_GAME_QVM),0) |
| 212 |
@@ -749,11 +745,11 @@ |
227 |
@@ -810,11 +795,11 @@ |
| 213 |
$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS) $(DEPEND_CFLAGS)" |
228 |
$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS) $(DEPEND_CFLAGS)" |
| 214 |
|
229 |
|
| 215 |
build_release: B=$(BR) |
230 |
build_release: B=$(BR) |
|
Lines 223-235
Link Here
|
| 223 |
|
238 |
|
| 224 |
targets: $(TARGETS) |
239 |
targets: $(TARGETS) |
| 225 |
|
240 |
|
| 226 |
@@ -964,13 +960,10 @@ |
241 |
@@ -1026,16 +1011,16 @@ |
| 227 |
ifeq ($(ARCH),i386) |
242 |
endif |
|
|
243 |
|
| 244 |
ifeq ($(HAVE_VM_COMPILED),true) |
| 245 |
- ifeq ($(ARCH),i386) |
| 246 |
+ ifeq ($(ARCH),x86) |
| 228 |
Q3OBJ += $(B)/client/vm_x86.o |
247 |
Q3OBJ += $(B)/client/vm_x86.o |
| 229 |
endif |
248 |
endif |
| 230 |
- ifeq ($(ARCH),x86) |
249 |
- ifeq ($(ARCH),x86) |
| 231 |
- Q3OBJ += $(B)/client/vm_x86.o |
250 |
+ ifeq ($(ARCH),i386) |
| 232 |
- endif |
251 |
Q3OBJ += $(B)/client/vm_x86.o |
|
|
252 |
endif |
| 233 |
- ifeq ($(ARCH),x86_64) |
253 |
- ifeq ($(ARCH),x86_64) |
| 234 |
+ ifeq ($(ARCH),amd64) |
254 |
+ ifeq ($(ARCH),amd64) |
| 235 |
Q3OBJ += $(B)/client/vm_x86_64.o |
255 |
Q3OBJ += $(B)/client/vm_x86_64.o |
|
Lines 239-264
Link Here
|
| 239 |
Q3OBJ += $(B)/client/$(VM_PPC).o |
259 |
Q3OBJ += $(B)/client/$(VM_PPC).o |
| 240 |
endif |
260 |
endif |
| 241 |
endif |
261 |
endif |
| 242 |
@@ -1017,10 +1010,10 @@ |
262 |
@@ -1071,7 +1056,7 @@ |
|
|
263 |
|
| 264 |
ifeq ($(USE_SDL),1) |
| 265 |
ifneq ($(PLATFORM),darwin) |
| 266 |
- BUILD_CLIENT_SMP = 0 |
| 267 |
+ #BUILD_CLIENT_SMP = 0 |
| 268 |
endif |
| 269 |
endif |
| 270 |
|
| 271 |
@@ -1084,10 +1069,10 @@ |
| 243 |
$(B)/client/sdl_glimp_smp.o |
272 |
$(B)/client/sdl_glimp_smp.o |
| 244 |
endif |
273 |
endif |
| 245 |
|
274 |
|
| 246 |
-$(B)/ioquake3.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) |
275 |
-$(B)/ioUrbanTerror.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) |
| 247 |
+$(B)/ioquake3$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) |
276 |
+$(B)/ioUrbanTerror$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) |
| 248 |
$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) |
277 |
$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) |
| 249 |
|
278 |
|
| 250 |
-$(B)/ioquake3-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
279 |
-$(B)/ioUrbanTerror-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
| 251 |
+$(B)/ioquake3-smp$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
280 |
+$(B)/ioUrbanTerror-smp$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
| 252 |
$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ |
281 |
$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ |
| 253 |
$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) |
282 |
$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) |
| 254 |
|
283 |
|
| 255 |
@@ -1317,18 +1310,15 @@ |
284 |
@@ -1389,21 +1374,21 @@ |
| 256 |
ifeq ($(ARCH),i386) |
285 |
endif |
|
|
286 |
|
| 287 |
ifeq ($(HAVE_VM_COMPILED),true) |
| 288 |
- ifeq ($(ARCH),i386) |
| 289 |
+ ifeq ($(ARCH),x86) |
| 257 |
Q3DOBJ += $(B)/ded/vm_x86.o |
290 |
Q3DOBJ += $(B)/ded/vm_x86.o |
| 258 |
endif |
291 |
endif |
| 259 |
- ifeq ($(ARCH),x86) |
292 |
- ifeq ($(ARCH),x86) |
| 260 |
- Q3DOBJ += $(B)/ded/vm_x86.o |
293 |
+ ifeq ($(ARCH),i386) |
| 261 |
- endif |
294 |
Q3DOBJ += $(B)/ded/vm_x86.o |
|
|
295 |
endif |
| 262 |
- ifeq ($(ARCH),x86_64) |
296 |
- ifeq ($(ARCH),x86_64) |
| 263 |
+ ifeq ($(ARCH),amd64) |
297 |
+ ifeq ($(ARCH),amd64) |
| 264 |
Q3DOBJ += $(B)/ded/vm_x86_64.o |
298 |
Q3DOBJ += $(B)/ded/vm_x86_64.o |
|
Lines 269-280
Link Here
|
| 269 |
endif |
303 |
endif |
| 270 |
endif |
304 |
endif |
| 271 |
|
305 |
|
| 272 |
-$(B)/ioq3ded.$(ARCH)$(BINEXT): $(Q3DOBJ) |
306 |
-$(B)/ioUrTded.$(ARCH)$(BINEXT): $(Q3DOBJ) |
| 273 |
+$(B)/ioq3ded$(BINEXT): $(Q3DOBJ) |
307 |
+$(B)/ioUrTded$(BINEXT): $(Q3DOBJ) |
| 274 |
$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) |
308 |
$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) |
| 275 |
|
309 |
|
| 276 |
$(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC) |
310 |
$(B)/ded/sv_battleye.o : $(SDIR)/sv_battleye.c; $(DO_DED_CC) |
| 277 |
@@ -1445,7 +1435,7 @@ |
311 |
@@ -1522,7 +1507,7 @@ |
| 278 |
Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o |
312 |
Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o |
| 279 |
Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm |
313 |
Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm |
| 280 |
|
314 |
|
|
Lines 283-289
Link Here
|
| 283 |
$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) |
317 |
$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) |
| 284 |
|
318 |
|
| 285 |
$(B)/baseq3/vm/cgame.qvm: $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm |
319 |
$(B)/baseq3/vm/cgame.qvm: $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm |
| 286 |
@@ -1486,7 +1476,7 @@ |
320 |
@@ -1563,7 +1548,7 @@ |
| 287 |
MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o |
321 |
MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o |
| 288 |
MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm |
322 |
MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm |
| 289 |
|
323 |
|
|
Lines 292-298
Link Here
|
| 292 |
$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ) |
326 |
$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ) |
| 293 |
|
327 |
|
| 294 |
$(B)/missionpack/vm/cgame.qvm: $(MPCGVMOBJ) $(CGDIR)/cg_syscalls.asm |
328 |
$(B)/missionpack/vm/cgame.qvm: $(MPCGVMOBJ) $(CGDIR)/cg_syscalls.asm |
| 295 |
@@ -1536,7 +1526,7 @@ |
329 |
@@ -1613,7 +1598,7 @@ |
| 296 |
Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o |
330 |
Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o |
| 297 |
Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm |
331 |
Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm |
| 298 |
|
332 |
|
|
Lines 301-307
Link Here
|
| 301 |
$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) |
335 |
$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) |
| 302 |
|
336 |
|
| 303 |
$(B)/baseq3/vm/qagame.qvm: $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm |
337 |
$(B)/baseq3/vm/qagame.qvm: $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm |
| 304 |
@@ -1584,7 +1574,7 @@ |
338 |
@@ -1661,7 +1646,7 @@ |
| 305 |
MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o |
339 |
MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o |
| 306 |
MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm |
340 |
MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm |
| 307 |
|
341 |
|
|
Lines 310-316
Link Here
|
| 310 |
$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ) |
344 |
$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ) |
| 311 |
|
345 |
|
| 312 |
$(B)/missionpack/vm/qagame.qvm: $(MPGVMOBJ) $(GDIR)/g_syscalls.asm |
346 |
$(B)/missionpack/vm/qagame.qvm: $(MPGVMOBJ) $(GDIR)/g_syscalls.asm |
| 313 |
@@ -1644,7 +1634,7 @@ |
347 |
@@ -1721,7 +1706,7 @@ |
| 314 |
Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o |
348 |
Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o |
| 315 |
Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm |
349 |
Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm |
| 316 |
|
350 |
|
|
Lines 319-325
Link Here
|
| 319 |
$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) |
353 |
$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) |
| 320 |
|
354 |
|
| 321 |
$(B)/baseq3/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm |
355 |
$(B)/baseq3/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm |
| 322 |
@@ -1669,7 +1659,7 @@ |
356 |
@@ -1746,7 +1731,7 @@ |
| 323 |
MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o |
357 |
MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o |
| 324 |
MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm |
358 |
MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm |
| 325 |
|
359 |
|