diff options
| author | Tim Angus <tim@ngus.net> | 2013-03-22 11:33:27 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-03-22 19:02:26 +0000 |
| commit | 3897bad13ef690240bba0b550037b6bead219975 (patch) | |
| tree | 79e4f73378144a274ff5dc8de07648e0410df0a2 /Makefile | |
| parent | 63d8e37881b7350b01050181fb9dd96567fdb2ef (diff) | |
Ditch 'historical compatibility' and use 'logic' instead
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 2 insertions, 24 deletions
@@ -51,9 +51,6 @@ PLATFORM=$(COMPILE_PLATFORM) endif export PLATFORM -ifeq ($(COMPILE_ARCH),i386) - COMPILE_ARCH=x86 -endif ifeq ($(COMPILE_ARCH),i86pc) COMPILE_ARCH=x86 endif @@ -81,11 +78,6 @@ ARCH=$(COMPILE_ARCH) endif export ARCH -ifndef FILE_ARCH -FILE_ARCH=$(ARCH) -endif -export FILE_ARCH - ifneq ($(PLATFORM),$(COMPILE_PLATFORM)) CROSS_COMPILING=1 else @@ -504,7 +496,6 @@ ifeq ($(PLATFORM),mingw32) -fstrength-reduce OPTIMIZE = $(OPTIMIZEVM) --fast-math HAVE_VM_COMPILED = true - FILE_ARCH=x64 endif ifeq ($(ARCH),x86) OPTIMIZEVM = -O3 -march=i586 -fno-omit-frame-pointer \ @@ -633,10 +624,6 @@ ifeq ($(PLATFORM),freebsd) BASE_CFLAGS += -m64 endif endif - - ifeq ($(ARCH),x86_64) - FILE_ARCH=amd64 - endif else # ifeq freebsd ############################################################################# @@ -682,10 +669,6 @@ ifeq ($(PLATFORM),openbsd) CLIENT_LIBS += -lcurl endif endif - - ifeq ($(ARCH),x86_64) - FILE_ARCH=amd64 - endif else # ifeq openbsd ############################################################################# @@ -707,10 +690,6 @@ ifeq ($(PLATFORM),netbsd) endif BUILD_CLIENT = 0 - - ifeq ($(ARCH),x86_64) - FILE_ARCH=amd64 - endif else # ifeq netbsd ############################################################################# @@ -830,11 +809,11 @@ ifeq ($(USE_FREETYPE),1) endif ifndef FULLBINEXT - FULLBINEXT=.$(FILE_ARCH)$(BINEXT) + FULLBINEXT=.$(ARCH)$(BINEXT) endif ifndef SHLIBNAME - SHLIBNAME=$(FILE_ARCH).$(SHLIBEXT) + SHLIBNAME=$(ARCH).$(SHLIBEXT) endif ifneq ($(BUILD_SERVER),0) @@ -1083,7 +1062,6 @@ targets: makedirs @echo "Building $(CLIENTBIN) in $(B):" @echo " PLATFORM: $(PLATFORM)" @echo " ARCH: $(ARCH)" - @echo " FILE_ARCH: $(FILE_ARCH)" @echo " VERSION: $(VERSION)" @echo " COMPILE_PLATFORM: $(COMPILE_PLATFORM)" @echo " COMPILE_ARCH: $(COMPILE_ARCH)" |