summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2013-03-11 22:20:10 +0000
committerTim Angus <tim@ngus.net>2013-03-19 16:41:18 +0000
commit80cd4a140c6c93db28b0659021931b0ca65efabc (patch)
tree1cf104f433fe2c12140848b09b659f4f5c14fb5d /Makefile
parent1327ed6c972cc1a4943402b77400fcd0d5818337 (diff)
Remove old x86_64 JIT compiler
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile64
1 files changed, 12 insertions, 52 deletions
diff --git a/Makefile b/Makefile
index 55ee28bc..63e618e0 100644
--- a/Makefile
+++ b/Makefile
@@ -200,10 +200,6 @@ ifndef DEBUG_CFLAGS
DEBUG_CFLAGS=-g -O0
endif
-ifndef USE_OLD_VM64
-USE_OLD_VM64=0
-endif
-
#############################################################################
BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
@@ -1787,34 +1783,16 @@ ifeq ($(HAVE_VM_COMPILED),true)
$(B)/client/vm_x86.o
endif
ifeq ($(ARCH),x86_64)
- 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
- endif
+ Q3OBJ += \
+ $(B)/client/vm_x86.o
endif
ifeq ($(ARCH),amd64)
- 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
- endif
+ Q3OBJ += \
+ $(B)/client/vm_x86.o
endif
ifeq ($(ARCH),x64)
- 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
- endif
+ Q3OBJ += \
+ $(B)/client/vm_x86.o
endif
ifeq ($(ARCH),ppc)
Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
@@ -1969,34 +1947,16 @@ ifeq ($(HAVE_VM_COMPILED),true)
$(B)/ded/vm_x86.o
endif
ifeq ($(ARCH),x86_64)
- 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
- endif
+ Q3DOBJ += \
+ $(B)/ded/vm_x86.o
endif
ifeq ($(ARCH),amd64)
- 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
- endif
+ Q3DOBJ += \
+ $(B)/ded/vm_x86.o
endif
ifeq ($(ARCH),x64)
- 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
- endif
+ Q3DOBJ += \
+ $(B)/ded/vm_x86.o
endif
ifeq ($(ARCH),ppc)
Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o