diff --git a/README.md b/README.md index 7fb240b..13fad99 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ issue. #Setup 1. Install a recent D compiler. DCD is tested with 2.065 and the 2.066 betas. 1. Run ```git submodule update --init``` after cloning this repository to grab the MessagePack and Datapacked libraries and the parser from DScanner. -1. run the ```build.sh``` script to build the client and server. (Or build.bat on Windows) +1. Run ```make``` to build the client and server. (Or run build.bat on Windows). ```make ldc``` and ```make gdc``` will use the LDC or GDC compilers. The resulting executable will be much faster. 1. Configure your text editor to call the dcd-client program. See the *editors* folder for directions on configuring your specific editor. 1. Start the dcd-server program before editing code. diff --git a/makefile b/makefile index af76ae2..c39db0d 100644 --- a/makefile +++ b/makefile @@ -3,11 +3,11 @@ all: dmd dmd: dmdserver dmdclient gdc: gdcserver gdcclient -#ldc: ldcserver ldcclient +ldc: ldcserver ldcclient DMD = dmd GDC = gdc -#LDC = ldc +LDC = ldc2 report: dscanner --report src > dscanner-report.json @@ -35,6 +35,14 @@ GDC_CLIENT_FLAGS = -Imsgpack-d/src\ -frelease\ -obin/dcd-client +LDC_CLIENT_FLAGS = -Imsgpack-d/src\ + -Imsgpack-d/src\ + -release\ + -inline\ + -O5\ + -oq\ + -of=bin/dcd-client + SERVER_SRC = src/actypes.d\ src/conversion/astconverter.d\ src/conversion/first.d\ @@ -75,12 +83,21 @@ DMD_SERVER_FLAGS = -Icontainers/src\ -inline\ -ofbin/dcd-server -GDC_SERVER_FLAGS = -Imsgpack-d/src\ +GDC_SERVER_FLAGS = -Icontainers/src\ + -Imsgpack-d/src\ -Ilibdparse/src\ -O3\ -frelease\ -obin/dcd-server +LDC_SERVER_FLAGS = -Icontainers/src\ + -Imsgpack-d/src\ + -Ilibdparse/src\ + -O5\ + -release\ + -oq\ + -of=bin/dcd-server + dmdclient: mkdir -p bin rm -f containers/src/std/allocator.d @@ -101,8 +118,8 @@ gdcserver: rm -f containers/src/std/allocator.d ${GDC} ${SERVER_SRC} ${GDC_SERVER_FLAGS} -#ldcclient: -# ${LDC} {CLIENT_SRC} ${LDC_CLIENT_FLAGS} -# -#ldcserver: -# ${LDC} {SERVER_SRC} ${LDC_SERVER_FLAGS} +ldcclient: + ${LDC} ${CLIENT_SRC} ${LDC_CLIENT_FLAGS} + +ldcserver: + ${LDC} ${SERVER_SRC} ${LDC_SERVER_FLAGS}