diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-06-01 15:17:18 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-09 22:37:40 +0000 |
| commit | 22f9847cfff218661fc36d48bcc28117dec5cd14 (patch) | |
| tree | 01b5b4e541849b9e5184bded4b2f836439eee74a /Makefile | |
| parent | 55232ad01e1a0a44aabda3d3aeb4764a9ecae822 (diff) | |
- Add x86_64 support to vm_x86.c - Fix warning on mingw64
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 74 |
1 files changed, 64 insertions, 10 deletions
@@ -161,6 +161,10 @@ ifndef DEBUG_CFLAGS DEBUG_CFLAGS=-g -O0 endif +ifndef USE_OLD_VM64 +USE_OLD_VM64=0 +endif + ############################################################################# BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH) @@ -1401,7 +1405,6 @@ ifeq ($(ARCH),x86) Q3OBJ += \ $(B)/client/snd_mixa.o \ $(B)/client/matha.o \ - $(B)/client/ftola.o \ $(B)/client/snapvectora.o endif @@ -1463,16 +1466,42 @@ endif ifeq ($(HAVE_VM_COMPILED),true) ifeq ($(ARCH),x86) - Q3OBJ += $(B)/client/vm_x86.o + Q3OBJ += \ + $(B)/client/vm_x86.o \ + $(B)/client/ftola.o endif ifeq ($(ARCH),x86_64) - Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o + ifeq ($(USE_OLD_VM64),1) + Q3OBJ += \ + $(B)/client/vm_x86_64.o \ + $(B)/client/vm_x86_64_assembler.o + else + Q3OBJ += \ + $(B)/client/vm_x86.o \ + $(B)/client/ftola.o + endif endif ifeq ($(ARCH),amd64) - Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o + ifeq ($(USE_OLD_VM64),1) + Q3OBJ += \ + $(B)/client/vm_x86_64.o \ + $(B)/client/vm_x86_64_assembler.o + else + Q3OBJ += \ + $(B)/client/vm_x86.o \ + $(B)/client/ftola.o + endif endif ifeq ($(ARCH),x64) - Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o + ifeq ($(USE_OLD_VM64),1) + Q3OBJ += \ + $(B)/client/vm_x86_64.o \ + $(B)/client/vm_x86_64_assembler.o + else + Q3OBJ += \ + $(B)/client/vm_x86.o \ + $(B)/client/ftola.o + endif endif ifeq ($(ARCH),ppc) Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o @@ -1579,7 +1608,6 @@ Q3DOBJ = \ ifeq ($(ARCH),x86) Q3DOBJ += \ - $(B)/ded/ftola.o \ $(B)/ded/snapvectora.o \ $(B)/ded/matha.o endif @@ -1596,16 +1624,42 @@ endif ifeq ($(HAVE_VM_COMPILED),true) ifeq ($(ARCH),x86) - Q3DOBJ += $(B)/ded/vm_x86.o + Q3DOBJ += \ + $(B)/ded/vm_x86.o \ + $(B)/ded/ftola.o endif ifeq ($(ARCH),x86_64) - Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o + ifeq ($(USE_OLD_VM64),1) + Q3DOBJ += \ + $(B)/ded/vm_x86_64.o \ + $(B)/ded/vm_x86_64_assembler.o + else + Q3DOBJ += \ + $(B)/ded/vm_x86.o \ + $(B)/ded/ftola.o + endif endif ifeq ($(ARCH),amd64) - Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o + ifeq ($(USE_OLD_VM64),1) + Q3DOBJ += \ + $(B)/ded/vm_x86_64.o \ + $(B)/ded/vm_x86_64_assembler.o + else + Q3DOBJ += \ + $(B)/ded/vm_x86.o \ + $(B)/ded/ftola.o + endif endif ifeq ($(ARCH),x64) - Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o + ifeq ($(USE_OLD_VM64),1) + Q3DOBJ += \ + $(B)/ded/vm_x86_64.o \ + $(B)/ded/vm_x86_64_assembler.o + else + Q3DOBJ += \ + $(B)/ded/vm_x86.o \ + $(B)/ded/ftola.o + endif endif ifeq ($(ARCH),ppc) Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o |