Skip to content

Commit 075285f

Browse files
committed
Makefile: Use a single DMD variable instead of multiple versions
This was originally done as part of PR 15 but has been inadvertently reverted.
1 parent 04838e8 commit 075285f

1 file changed

Lines changed: 6 additions & 22 deletions

File tree

dm/src/dmc/makefile

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@
1313

1414
DMCDIR=\dm
1515

16-
#DMDDIR=e:\dmd2.074
17-
#DMDDIR79=e:\dmd2.079
18-
DMDDIR=e:\dmd2.079
19-
DMDDIR74=e:\dmd2.074
20-
DMDDIR79=e:\dmd2.079
21-
DMDDIR92=e:\dmd2.092
22-
2316
CBX=.
2417
NTDLLSHELL=ntdllshell
2518
TK=tk
@@ -70,16 +63,7 @@ LFLAGS=/map/e/f/packcode/noe;
7063
##### Tools
7164

7265
# D compiler
73-
DMD=$(DMDDIR)\windows\bin\dmd
74-
DMD74=$(DMDDIR74)\windows\bin\dmd
75-
DMD79=$(DMDDIR79)\windows\bin\dmd
76-
DMDXX=$(DMDDIR74)\windows\bin\dmd
77-
78-
DMD=$(DMDDIR92)\windows\bin\dmd
79-
DMD74=$(DMDDIR92)\windows\bin\dmd
80-
DMD79=$(DMDDIR92)\windows\bin\dmd
81-
DMDXX=$(DMDDIR92)\windows\bin\dmd
82-
66+
DMD=dmd
8367
# C++ compiler
8468
CC=dmc
8569
# Make program
@@ -430,7 +414,7 @@ barray.obj : barray.d
430414
$(DMD) -c $(DFLAGS) barray.d
431415

432416
bcomplex.obj : bcomplex.d
433-
$(DMD79) -c $(DFLAGS) bcomplex.d
417+
$(DMD) -c $(DFLAGS) bcomplex.d
434418

435419
blockopt.obj : blockopt.d
436420
$(DMD) -c $(DFLAGS) blockopt.d
@@ -484,7 +468,7 @@ cgen.obj : cgen.d
484468
$(DMD) -c $(DFLAGS) cgen.d
485469

486470
cgobj.obj : cgobj.d code.d
487-
$(DMDXX) -c $(DFLAGS) -J. cgobj.d code.d
471+
$(DMD) -c $(DFLAGS) -J. cgobj.d code.d
488472

489473
mscoffobj.obj : mscoffobj.d
490474
$(DMD) -c $(DFLAGS) -J. mscoffobj.d
@@ -547,7 +531,7 @@ dnwc.obj : dnwc.d
547531
$(DMD) -c $(DFLAGS) dnwc.d
548532

549533
dph.obj : dph.d page.di
550-
$(DMD79) -c $(DFLAGS) dph.d
534+
$(DMD) -c $(DFLAGS) dph.d
551535

552536
dpragma.obj : dpragma.d
553537
$(DMD) -c $(DFLAGS) dpragma.d
@@ -559,10 +543,10 @@ dspeller.obj : dspeller.d
559543
$(DMD) -c $(DFLAGS) dspeller.d
560544

561545
dtemplate.obj : dtemplate.d
562-
$(DMD79) -c $(DFLAGS) dtemplate.d
546+
$(DMD) -c $(DFLAGS) dtemplate.d
563547

564548
dtype.obj : dtype.d
565-
$(DMD79) -c $(DFLAGS) dtype.d
549+
$(DMD) -c $(DFLAGS) dtype.d
566550

567551
dwarfeh.obj : dwarfeh.d
568552
$(DMD) -c $(DFLAGS) dwarfeh.d

0 commit comments

Comments
 (0)