fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-03-13 14:28:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile, Makefile.w32: now that native amd64 builds work, adjusted for CPUFLAGS.

Browse source 
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@39 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2010-02-17 15:25:25 +00:00
parent d1c2475623
commit 2923910635
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
quakespasm/Quake/Makefile
View file

@ -6,7 +6,6 @@
# You'll need SDL and SDL_net fully installed. # You'll need SDL and SDL_net fully installed.
# "make DEBUG=1" builds debug client # "make DEBUG=1" builds debug client
# "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations # "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations
# "make AMD64=1" for a 64 bit binary on 64 bit cpus (disabled by default, broken)
# #
# Currently build objects are separate from those of codeblocks, but this may change. # Currently build objects are separate from those of codeblocks, but this may change.
# FreeBSD users may have to mess with include directories and also "-nosound" # FreeBSD users may have to mess with include directories and also "-nosound"
@ -54,9 +53,15 @@ CC ?= gcc
WINDRES ?= windres WINDRES ?= windres
STRIP ?= strip STRIP ?= strip
#CPUFLAGS= -mtune=i686
#CPUFLAGS= -march=pentium4
#CPUFLAGS= -mtune=k8
#CPUFLAGS= -march=atom
CPUFLAGS=
DFLAGS ?= DFLAGS ?=
CFLAGS ?= -Wall -Wno-trigraphs CFLAGS ?= -Wall -Wno-trigraphs
# CFLAGS += -Werror # CFLAGS += -Werror
CFLAGS += $(CPUFLAGS)
ifneq ($(DEBUG),0) ifneq ($(DEBUG),0)
DFLAGS += -DDEBUG DFLAGS += -DDEBUG
@ -68,19 +73,9 @@ DFLAGS += -DNDEBUG
CFLAGS += -O2 CFLAGS += -O2
CFLAGS += $(call check_gcc,-fweb,) CFLAGS += $(call check_gcc,-fweb,)
CFLAGS += $(call check_gcc,-frename-registers,) CFLAGS += $(call check_gcc,-frename-registers,)
CFLAGS += $(call check_gcc,-mtune=i686,-mcpu=i686)
STRIP_CMD := $(STRIP) STRIP_CMD := $(STRIP)
endif endif
### 64 bit disabled unless AMD64=1
# FIXME: do a better string searchng here!!
ifneq (,$(findstring 64,$(shell uname -p)))
ifeq ($(AMD64),)
CFLAGS += -m32
LFLAGS += -m32
endif
endif
### X11BASE only gets used if its in an unusual place ### X11BASE only gets used if its in an unusual place
X11DIRS := /usr/X11R7 /usr/local/X11R7 /usr/X11R6 /usr/local/X11R6 X11DIRS := /usr/X11R7 /usr/local/X11R7 /usr/X11R6 /usr/local/X11R6

5
quakespasm/Quake/Makefile.w32
View file

@ -23,9 +23,13 @@ CC = i686-pc-mingw32-gcc
WINDRES = i686-pc-mingw32-windres WINDRES = i686-pc-mingw32-windres
STRIP = i686-pc-mingw32-strip STRIP = i686-pc-mingw32-strip
#CPUFLAGS= -mtune=i686
#CPUFLAGS= -march=pentium4
CPUFLAGS=
DFLAGS ?= DFLAGS ?=
CFLAGS ?= -Wall -Wno-trigraphs CFLAGS ?= -Wall -Wno-trigraphs
# CFLAGS += -Werror # CFLAGS += -Werror
CFLAGS += $(CPUFLAGS)
ifneq ($(DEBUG),0) ifneq ($(DEBUG),0)
DFLAGS += -DDEBUG DFLAGS += -DDEBUG
@ -37,7 +41,6 @@ DFLAGS += -DNDEBUG
CFLAGS += -O2 CFLAGS += -O2
CFLAGS += $(call check_gcc,-fweb,) CFLAGS += $(call check_gcc,-fweb,)
CFLAGS += $(call check_gcc,-frename-registers,) CFLAGS += $(call check_gcc,-frename-registers,)
CFLAGS += $(call check_gcc,-mtune=i686,-mcpu=i686)
STRIP_CMD := $(STRIP) STRIP_CMD := $(STRIP)
endif endif