From 0135939f73dc9a25c8c497546172e471fb3ee160 Mon Sep 17 00:00:00 2001 From: Daniel Murphy Date: Sat, 3 Jan 2015 10:33:50 +1100 Subject: [PATCH] Eliminate DMDV1/DMDV2 --- src/mars.h | 3 --- src/posix.mak | 2 +- src/win32.mak | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mars.h b/src/mars.h index 3f24ab2c0074..60678e83e45e 100644 --- a/src/mars.h +++ b/src/mars.h @@ -73,9 +73,6 @@ the target object file format: void unittests(); -#define DMDV1 0 -#define DMDV2 1 // Version 2.0 features - struct OutBuffer; // Can't include arraytypes.h here, need to declare these directly. diff --git a/src/posix.mak b/src/posix.mak index c9ddf63d540b..df072f661dcf 100644 --- a/src/posix.mak +++ b/src/posix.mak @@ -92,7 +92,7 @@ MMD=-MMD -MF $(basename $@).deps # Default compiler flags for all source files CFLAGS := $(WARNINGS) \ -fno-exceptions -fno-rtti \ - -D__pascal= -DMARS=1 -DTARGET_$(OS_UPCASE)=1 -DDM_TARGET_CPU_$(TARGET_CPU)=1 \ + -D__pascal= -DMARS=1 -DTARGET_$(OS_UPCASE)=1 -DDM_TARGET_CPU_$(TARGET_CPU)=1 -DDMDV2=1 \ ifneq (,$(DEBUG)) ENABLE_DEBUG := 1 diff --git a/src/win32.mak b/src/win32.mak index f0a62584cd9c..054a77d903c9 100644 --- a/src/win32.mak +++ b/src/win32.mak @@ -121,7 +121,7 @@ BFLAGS= # Compile flags CFLAGS=-I$(INCLUDE) $(OPT) $(CFLAGS) $(DEBUG) -cpp -DTARGET_WINDOS=1 -DDM_TARGET_CPU_X86=1 # Compile flags for modules with backend/toolkit dependencies -MFLAGS=-I$C;$(TK) $(OPT) -DMARS -cpp $(DEBUG) -e -wx -DTARGET_WINDOS=1 -DDM_TARGET_CPU_X86=1 +MFLAGS=-I$C;$(TK) $(OPT) -DMARS -cpp $(DEBUG) -e -wx -DTARGET_WINDOS=1 -DDM_TARGET_CPU_X86=1 -DDMDV2=1 # Recursive make DMDMAKE=$(MAKE) -fwin32.mak C=$C TK=$(TK) ROOT=$(ROOT)