|
Lines 58-68
Link Here
|
| 58 |
ifneq ($(ARCH),axp) |
58 |
ifneq ($(ARCH),axp) |
| 59 |
ifneq ($(ARCH),ppc) |
59 |
ifneq ($(ARCH),ppc) |
| 60 |
ifneq ($(ARCH),sparc) |
60 |
ifneq ($(ARCH),sparc) |
|
|
61 |
ifneq ($(ARCH),x86_64) |
| 61 |
$(error arch $(ARCH) is currently not supported) |
62 |
$(error arch $(ARCH) is currently not supported) |
| 62 |
endif |
63 |
endif |
| 63 |
endif |
64 |
endif |
| 64 |
endif |
65 |
endif |
| 65 |
endif |
66 |
endif |
|
|
67 |
endif |
| 66 |
|
68 |
|
| 67 |
CC=gcc |
69 |
CC=gcc |
| 68 |
|
70 |
|
|
Lines 82-93
Link Here
|
| 82 |
endif |
84 |
endif |
| 83 |
|
85 |
|
| 84 |
ifeq ($(ARCH),i386) |
86 |
ifeq ($(ARCH),i386) |
| 85 |
RELEASE_CFLAGS=-ffast-math -funroll-loops $(BASE_CFLAGS) |
87 |
RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -malign-loops=2 \ |
| 86 |
# -falign-jumps=2 -falign-functions=2 -g |
88 |
-malign-jumps=2 -malign-functions=2 -g |
| 87 |
# compiler bugs with gcc 2.96 and 3.0.1 can cause bad builds with heavy opts. |
89 |
# compiler bugs with gcc 2.96 and 3.0.1 can cause bad builds with heavy opts. |
| 88 |
#RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -m486 -ffast-math -funroll-loops \ |
90 |
#RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -m486 -ffast-math -funroll-loops \ |
| 89 |
# -fomit-frame-pointer -fexpensive-optimizations -falign-loops=2 \ |
91 |
# -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ |
| 90 |
# -falign-jumps=2 -falign-functions=2 |
92 |
# -malign-jumps=2 -malign-functions=2 |
|
|
93 |
endif |
| 94 |
|
| 95 |
ifeq ($(ARCH),x86_64) |
| 96 |
RELEASE_CFLAGS=$(BASE_CFLAGS) -fomit-frame-pointer -fexpensive-optimizations |
| 91 |
endif |
97 |
endif |
| 92 |
|
98 |
|
| 93 |
VERSION=3.21+rCVS |
99 |
VERSION=3.21+rCVS |
|
Lines 338-348
Link Here
|
| 338 |
endif |
344 |
endif |
| 339 |
endif # ARCH i386 |
345 |
endif # ARCH i386 |
| 340 |
|
346 |
|
|
|
347 |
ifeq ($(ARCH),x86_64) |
| 348 |
ifeq ($(strip $(BUILD_SDLQUAKE2)),YES) |
| 349 |
TARGETS += $(BUILDDIR)/sdlquake2 |
| 350 |
endif |
| 351 |
|
| 352 |
ifeq ($(strip $(BUILD_SVGA)),YES) |
| 353 |
TARGETS += $(BUILDDIR)/ref_soft.$(SHLIBEXT) |
| 354 |
endif |
| 355 |
|
| 356 |
ifeq ($(strip $(BUILD_X11)),YES) |
| 357 |
TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT) |
| 358 |
endif |
| 359 |
|
| 360 |
ifeq ($(strip $(BUILD_GLX)),YES) |
| 361 |
TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT) |
| 362 |
endif |
| 363 |
|
| 364 |
ifeq ($(strip $(BUILD_FXGL)),YES) |
| 365 |
TARGETS += $(BUILDDIR)/ref_gl.$(SHLIBEXT) |
| 366 |
endif |
| 367 |
|
| 368 |
ifeq ($(strip $(BUILD_SDL)),YES) |
| 369 |
TARGETS += $(BUILDDIR)/ref_softsdl.$(SHLIBEXT) |
| 370 |
endif |
| 371 |
|
| 372 |
ifeq ($(strip $(BUILD_SDLGL)),YES) |
| 373 |
TARGETS += $(BUILDDIR)/ref_sdlgl.$(SHLIBEXT) |
| 374 |
endif |
| 375 |
endif # ARCH x86_64 |
| 376 |
|
| 341 |
ifeq ($(strip $(BUILD_AA)),YES) |
377 |
ifeq ($(strip $(BUILD_AA)),YES) |
| 342 |
TARGETS += $(BUILDDIR)/ref_softaa.$(SHLIBEXT) |
378 |
TARGETS += $(BUILDDIR)/ref_softaa.$(SHLIBEXT) |
| 343 |
endif |
379 |
endif |
| 344 |
|
380 |
|
| 345 |
RELEASE_CFLAGS += $(OPTCFLAGS) |
|
|
| 346 |
all: build_debug build_release |
381 |
all: build_debug build_release |
| 347 |
|
382 |
|
| 348 |
build_debug: |
383 |
build_debug: |
|
Lines 441-447
Link Here
|
| 441 |
QUAKE2_AS_OBJS = \ |
476 |
QUAKE2_AS_OBJS = \ |
| 442 |
$(BUILDDIR)/client/snd_mixa.o |
477 |
$(BUILDDIR)/client/snd_mixa.o |
| 443 |
else |
478 |
else |
| 444 |
QUAKE2_AS_OBJS = #blank |
479 |
QUAKE2_AS_OBJS = \ |
|
|
480 |
$(BUILDDIR)/client/snd_mixa.o #forcing for all to include x86_64, probably dangerous |
| 445 |
endif |
481 |
endif |
| 446 |
|
482 |
|
| 447 |
$(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS) |
483 |
$(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS) |
|
Lines 1540-1545
Link Here
|
| 1540 |
$(BUILDDIR)/ref_soft/sys_dosa.o |
1576 |
$(BUILDDIR)/ref_soft/sys_dosa.o |
| 1541 |
endif |
1577 |
endif |
| 1542 |
|
1578 |
|
|
|
1579 |
ifeq ($(ARCH),x86_64) #do the same as i386 |
| 1580 |
REF_SOFT_OBJS += \ |
| 1581 |
$(BUILDDIR)/ref_soft/r_aclipa.o \ |
| 1582 |
$(BUILDDIR)/ref_soft/r_draw16.o \ |
| 1583 |
$(BUILDDIR)/ref_soft/r_drawa.o \ |
| 1584 |
$(BUILDDIR)/ref_soft/r_edgea.o \ |
| 1585 |
$(BUILDDIR)/ref_soft/r_scana.o \ |
| 1586 |
$(BUILDDIR)/ref_soft/r_spr8.o \ |
| 1587 |
$(BUILDDIR)/ref_soft/r_surf8.o \ |
| 1588 |
$(BUILDDIR)/ref_soft/math.o \ |
| 1589 |
$(BUILDDIR)/ref_soft/d_polysa.o \ |
| 1590 |
$(BUILDDIR)/ref_soft/r_varsa.o \ |
| 1591 |
$(BUILDDIR)/ref_soft/sys_dosa.o |
| 1592 |
endif |
| 1593 |
|
| 1543 |
REF_SOFT_SVGA_OBJS = \ |
1594 |
REF_SOFT_SVGA_OBJS = \ |
| 1544 |
$(BUILDDIR)/ref_soft/rw_svgalib.o \ |
1595 |
$(BUILDDIR)/ref_soft/rw_svgalib.o \ |
| 1545 |
$(BUILDDIR)/ref_soft/d_copy.o \ |
1596 |
$(BUILDDIR)/ref_soft/d_copy.o \ |
