diff --git a/dcompiler.dd b/dcompiler.dd index a08ec2e21d..cdfa43939c 100644 --- a/dcompiler.dd +++ b/dcompiler.dd @@ -23,7 +23,7 @@ $(D_S dmd - $(WINDOWS Windows)$(LINUX Linux)$(OSX Mac OS X)$(FREEBSD FreeBSD) D $(H2 $(LNAME2 requirements, Requirements and Downloads)) $(OL - $(LI $(LINK2 https://dlang.org/download.html, Download D Compiler)) + $(LI $(LINK2 https://dlang.org/download.html, DMD Compiler)) $(WINDOWS $(LI Windows operating system, Windows 7 or later, 32 or 64 bit) @@ -35,7 +35,11 @@ $(H2 $(LNAME2 requirements, Requirements and Downloads)) ) ) $(LINUX - $(LI 32 bit x86 and 64 bit x86-64 Linux operating system) + $(LI 32 bit x86 and 64 bit x86-64 Linux operating system + ($(LINK2 https://github.com/ldc-developers/ldc, LDC) + and $(LINK2 https://github.com/D-Programming-GDC/GDC, GDC) + provide support for more architectures) + ) $(LI Gnu C compiler (gcc) or LLVM C compiler (clang)) ) @@ -45,7 +49,7 @@ $(H2 $(LNAME2 requirements, Requirements and Downloads)) $(LI Xcode) ) $(FREEBSD - $(LI 32 bit x86 FreeBSD 7.1 operating system) + $(LI 32 bit x86 and 64 bit x86-64 FreeBSD operating system (11 or later)) $(LI Gnu C compiler (gcc)) ) @@ -54,6 +58,9 @@ $(H2 $(LNAME2 requirements, Requirements and Downloads)) $(H2 $(LNAME2 installation, Installation)) $(WINDOWS +$(MESSAGE_BOX gray, $(B Hint) - The official $(LINK2 $(ROOT_DIR)download.sh, installer) +performs these steps automatically. +) $(P Open a console window (for Windows XP this is done by clicking on [Start][Command Prompt]). All the tools are command line tools, which means @@ -75,6 +82,9 @@ C:\>unzip dmc.zip ) ) $(LINUX + + $(INSTALLATION_SCRIPT_HINT) + $(LI Unzip the archive into your home directory. It will create a $(D ~/dmd) directory with all the files in it. @@ -100,6 +110,9 @@ cp $(DMDDIR)/linux/lib/$(LIB) /usr/lib ) ) $(FREEBSD + + $(INSTALLATION_SCRIPT_HINT) + $(LI Unzip the archive into your home directory. It will create a $(D ~/dmd) directory with all the files in it. @@ -125,6 +138,9 @@ cp $(DMDDIR)/freebsd/lib/$(LIB) /usr/lib ) ) $(OSX + + $(INSTALLATION_SCRIPT_HINT) + $(LI Put the dmd zip file into your home directory, and unzip it: @@ -504,7 +520,8 @@ set LIB=$(DMDDIR)\lib;\dm\lib ) $(P Linking 64 bit programs is done using the - Microsoft linker. + Microsoft linker by default. If the Microsoft linker is not found, + the included LLVM linker LLD will be used. ) ) $(UNIX @@ -548,7 +565,7 @@ set LINKCMD=\dmd\windows\bin\link $(B LINKCMD64) environment variable to it. For example:) $(CONSOLE -set LINKCMD64=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64\link.exe +set LINKCMD64=C:\Program Files (x86)\Microsoft Visual Studio 15.0\VC\bin\amd64\link.exe ) $(DT $(B PATH)) @@ -764,6 +781,7 @@ $(H2 $(LNAME2 executable, Building Executables)) invocation of $(B dmd) is that $(B dmd) will be able to do some level of cross-module optimizations, such as function inlining across modules. ) + $(P The $(D -i) flag can be used to automatically compile imported modules) $(H2 $(LNAME2 library, Building Libraries)) @@ -851,17 +869,15 @@ $(H2 $(LEGACY_LNAME2 compiling_phobos, compiling-phobos, Compiling Phobos)) $(WINDOWS $(CONSOLE cd $(DMDDIR)\src\druntime -make -f win32.mak DMD=$(DMDDIR)\$(OS)\bin\dmd +make -f win32.mak cd ..\phobos -make -f win32.mak DMD=$(DMDDIR)\$(OS)\bin\dmd +make -f win32.mak ) ) $(UNIX $(CONSOLE -cd ~/$(DMDDIR)/src/druntime -make -f posix.mak DMD=~/$(DMDDIR)/$(OS)/bin/dmd cd ../phobos -make -f posix.mak DMD=~/$(DMDDIR)/$(OS)/bin/dmd +make -f posix.mak ) ) @@ -885,3 +901,11 @@ Macros: CLI_SWITCHES=$1 SHELL=$(HTTP digitalmars.com/ctg/shell.html, shell) SUBNAV=$(SUBNAV_CLI_REFERENCE) + INSTALLATION_SCRIPT_HINT= +$(P +$(MESSAGE_BOX gray, $(B Hint) - The official $(LINK2 $(ROOT_DIR)download.sh, packages) +performs these steps automatically. +Alternatively, you can install DMD in your user directory with +the $(LINK2 $(ROOT_DIR)install.sh, install script). +)) + _ =