ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-12-13 13:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename x86_64 -> x64 for Windows

Browse source
This commit is contained in:
Ludwig Nussel 2010-03-19 08:59:22 +00:00
parent 65212bbeb2
commit 112287088e
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -484,7 +484,7 @@ ifeq ($(PLATFORM),mingw32)
CLIENT_CFLAGS += -DUSE_CODEC_VORBIS CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
endif endif
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x64)
OPTIMIZEVM = -O3 -fno-omit-frame-pointer \ OPTIMIZEVM = -O3 -fno-omit-frame-pointer \
-falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \ -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
-fstrength-reduce -fstrength-reduce
@ -515,7 +515,7 @@ ifeq ($(PLATFORM),mingw32)
ifneq ($(USE_CURL_DLOPEN),1) ifneq ($(USE_CURL_DLOPEN),1)
ifeq ($(USE_LOCAL_HEADERS),1) ifeq ($(USE_LOCAL_HEADERS),1)
CLIENT_CFLAGS += -DCURL_STATICLIB CLIENT_CFLAGS += -DCURL_STATICLIB
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x64)
CLIENT_LIBS += $(LIBSDIR)/win64/libcurl.a CLIENT_LIBS += $(LIBSDIR)/win64/libcurl.a
else else
CLIENT_LIBS += $(LIBSDIR)/win32/libcurl.a CLIENT_LIBS += $(LIBSDIR)/win32/libcurl.a
@ -895,9 +895,7 @@ endif
ifeq ($(USE_INTERNAL_ZLIB),1) ifeq ($(USE_INTERNAL_ZLIB),1)
BASE_CFLAGS += -DNO_GZIP BASE_CFLAGS += -DNO_GZIP
ifneq ($(USE_LOCAL_HEADERS),1) BASE_CFLAGS += -I$(ZDIR)
BASE_CFLAGS += -I$(ZDIR)
endif
else else
LIBS += -lz LIBS += -lz
endif endif
@ -1550,6 +1548,9 @@ ifeq ($(HAVE_VM_COMPILED),true)
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
endif endif
ifeq ($(ARCH),x64)
Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
endif
ifeq ($(ARCH),ppc) ifeq ($(ARCH),ppc)
Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
endif endif
@ -1718,6 +1719,9 @@ ifeq ($(HAVE_VM_COMPILED),true)
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
endif endif
ifeq ($(ARCH),x64)
Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
endif
ifeq ($(ARCH),ppc) ifeq ($(ARCH),ppc)
Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o
endif endif

7
misc/nsis/Makefile
View file

@ -1,12 +1,13 @@
VERSION=1.35_SVN VERSION=1.35_SVN
RELEASE=0 RELEASE=0
ARCH=x86
all: ioquake3-$(VERSION)-$(RELEASE).x86.exe all: ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe
ioquake3.nsi: ioquake3.nsi.in 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 makensis ioquake3.nsi
clean: clean: