From 112287088e918d55f9b0fa6c56c2679167be8039 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Fri, 19 Mar 2010 08:59:22 +0000
Subject: [PATCH] rename x86_64 -> x64 for Windows

---
 Makefile           | 14 +++++++++-----
 misc/nsis/Makefile |  7 ++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index aaa39d72..394c139c 100644
--- a/Makefile
+++ b/Makefile
@@ -484,7 +484,7 @@ ifeq ($(PLATFORM),mingw32)
     CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
   endif
 
-  ifeq ($(ARCH),x86_64)
+  ifeq ($(ARCH),x64)
     OPTIMIZEVM = -O3 -fno-omit-frame-pointer \
       -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
       -fstrength-reduce
@@ -515,7 +515,7 @@ ifeq ($(PLATFORM),mingw32)
     ifneq ($(USE_CURL_DLOPEN),1)
       ifeq ($(USE_LOCAL_HEADERS),1)
         CLIENT_CFLAGS += -DCURL_STATICLIB
-        ifeq ($(ARCH),x86_64)
+        ifeq ($(ARCH),x64)
 	  CLIENT_LIBS += $(LIBSDIR)/win64/libcurl.a
 	else
           CLIENT_LIBS += $(LIBSDIR)/win32/libcurl.a
@@ -895,9 +895,7 @@ endif
 
 ifeq ($(USE_INTERNAL_ZLIB),1)
   BASE_CFLAGS += -DNO_GZIP
-  ifneq ($(USE_LOCAL_HEADERS),1)
-    BASE_CFLAGS += -I$(ZDIR)
-  endif
+  BASE_CFLAGS += -I$(ZDIR)
 else
   LIBS += -lz
 endif
@@ -1550,6 +1548,9 @@ ifeq ($(HAVE_VM_COMPILED),true)
   ifeq ($(ARCH),amd64)
     Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
   endif
+  ifeq ($(ARCH),x64)
+    Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
+  endif
   ifeq ($(ARCH),ppc)
     Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
   endif
@@ -1718,6 +1719,9 @@ ifeq ($(HAVE_VM_COMPILED),true)
   ifeq ($(ARCH),amd64)
     Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
   endif
+  ifeq ($(ARCH),x64)
+    Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
+  endif
   ifeq ($(ARCH),ppc)
     Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o
   endif
diff --git a/misc/nsis/Makefile b/misc/nsis/Makefile
index 4405f0f6..6f3cc596 100644
--- a/misc/nsis/Makefile
+++ b/misc/nsis/Makefile
@@ -1,12 +1,13 @@
 VERSION=1.35_SVN
 RELEASE=0
+ARCH=x86
 
-all: ioquake3-$(VERSION)-$(RELEASE).x86.exe
+all: ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe
 
 ioquake3.nsi: ioquake3.nsi.in
-	sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/' < $< > $@
+	sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/;s/x86/$(ARCH)/g' < $< > $@
 
-ioquake3-$(VERSION)-$(RELEASE).x86.exe: ioquake3.nsi
+ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe: ioquake3.nsi
 	makensis ioquake3.nsi
 
 clean: