diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 64 |
1 files changed, 12 insertions, 52 deletions
@@ -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 |