forks
/
DCD
mirror of https://github.com/dlang-community/DCD.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Hackerpilot/DCD

This commit is contained in:
Hackerpilot 2016-01-29 13:19:52 -08:00
parent ad2fe5168a 9506faa205
commit 9204b082d2
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -8,7 +8,7 @@
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"dsymbol": "~>0.1.1", "dsymbol": "~>0.1.1",
"libdparse": "~>0.4.1", "libdparse": "~>0.5.0",
"msgpack-d": "~>1.0.0-beta.2" "msgpack-d": "~>1.0.0-beta.2"
}, },
"versions": ["built_with_dub"], "versions": ["built_with_dub"],

2
libdparse

@ -1 +1 @@
Subproject commit 725529f0da46d11b1599337d501725f2bbd29ef3 Subproject commit 2ee91136abf935546de6bf581fd215b86d70e14e

32
makefile
View File

@ -11,6 +11,8 @@ GDC := gdc
LDC := ldc2 LDC := ldc2
OBJ_DIR := objs OBJ_DIR := objs
DPARSE_DIR := libdparse
DSYMBOL_DIR := dsymbol
githash: githash:
git log -1 --format="%H" > githash.txt git log -1 --format="%H" > githash.txt
@ -59,13 +61,13 @@ LDC_CLIENT_FLAGS := -Imsgpack-d/src\
SERVER_SRC := \ SERVER_SRC := \
$(shell find src/common -name "*.d")\ $(shell find src/common -name "*.d")\
$(shell find src/server -name "*.d")\ $(shell find src/server -name "*.d")\
$(shell find dsymbol/src -name "*.d")\ $(shell find ${DSYMBOL_DIR}/src -name "*.d")\
libdparse/src/dparse/ast.d\ ${DPARSE_DIR}/src/dparse/ast.d\
libdparse/src/dparse/entities.d\ ${DPARSE_DIR}/src/dparse/entities.d\
libdparse/src/dparse/lexer.d\ ${DPARSE_DIR}/src/dparse/lexer.d\
libdparse/src/dparse/parser.d\ ${DPARSE_DIR}/src/dparse/parser.d\
libdparse/src/dparse/formatter.d\ ${DPARSE_DIR}/src/dparse/formatter.d\
libdparse/src/std/experimental/lexer.d\ ${DPARSE_DIR}/src/std/experimental/lexer.d\
$(shell find containers/experimental_allocator/src/std/experimental/allocator/ -name "*.d")\ $(shell find containers/experimental_allocator/src/std/experimental/allocator/ -name "*.d")\
containers/src/containers/dynamicarray.d\ containers/src/containers/dynamicarray.d\
containers/src/containers/ttree.d\ containers/src/containers/ttree.d\
@ -83,8 +85,8 @@ SERVER_OBJS = $(SERVER_SRC:%.d=$(OBJ_DIR)/%.o)
DMD_SERVER_FLAGS := -Icontainers/src\ DMD_SERVER_FLAGS := -Icontainers/src\
-Imsgpack-d/src\ -Imsgpack-d/src\
-Ilibdparse/src\ -I${DPARSE_DIR}/src\
-Idsymbol/src\ -I${DSYMBOL_DIR}/src\
-Icontainers/experimental_allocator/src\ -Icontainers/experimental_allocator/src\
-J.\ -J.\
-wi\ -wi\
@ -95,8 +97,8 @@ DMD_SERVER_FLAGS := -Icontainers/src\
DEBUG_SERVER_FLAGS := -Icontainers/src\ DEBUG_SERVER_FLAGS := -Icontainers/src\
-Imsgpack-d/src\ -Imsgpack-d/src\
-Ilibdparse/src\ -I${DPARSE_DIR}/src\
-Idsymbol/src\ -I${DSYMBOL_DIR}/src\
-Icontainers/experimental_allocator/src\ -Icontainers/experimental_allocator/src\
-wi\ -wi\
-g\ -g\
@ -105,8 +107,8 @@ DEBUG_SERVER_FLAGS := -Icontainers/src\
GDC_SERVER_FLAGS := -Icontainers/src\ GDC_SERVER_FLAGS := -Icontainers/src\
-Imsgpack-d/src\ -Imsgpack-d/src\
-Ilibdparse/src\ -I${DPARSE_DIR}/src\
-Idsymbol/src\ -I${DSYMBOL_DIR}/src\
-Icontainers/experimental_allocator/src\ -Icontainers/experimental_allocator/src\
-J.\ -J.\
-O3\ -O3\
@ -115,8 +117,8 @@ GDC_SERVER_FLAGS := -Icontainers/src\
LDC_SERVER_FLAGS := -Icontainers/src\ LDC_SERVER_FLAGS := -Icontainers/src\
-Imsgpack-d/src\ -Imsgpack-d/src\
-Ilibdparse/src\ -I${DPARSE_DIR}/src\
-Idsymbol/src\ -I${DSYMBOL_DIR}/src\
-Icontainers/experimental_allocator/src\ -Icontainers/experimental_allocator/src\
-Isrc\ -Isrc\
-J=.\ -J=.\