FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

#1052

This commit is contained in:
Thomas Nagy 2011-10-19 04:02:03 +02:00
parent 98be37f206
commit a65b19cb36
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/d/example.d
View File

@ -4,7 +4,7 @@ def. gh;
import std.stdio; // for writefln()
import std . // system2;
system ;
static import std.date, std.thread /+ /+ +/ , std.io +/ ;
//static import std.date, std.thread /+ /+ +/ , std.io +/ ;
import testlib.code;

2
waflib/Tools/d.py
View File

@ -27,7 +27,7 @@ class d_header(Task.Task):
class dprogram(link_task):
"Link object files into a d program"
run_str = '${D_LINKER} ${LINKFLAGS} ${DLNK_SRC_F}${SRC} ${DLNK_TGT_F:TGT} ${RPATH_ST:RPATH} ${DSTLIB_MARKER} ${DSTLIBPATH_ST:STLIBPATH} ${DSTLIB_ST:STLIB} ${DSHLIB_MARKER} ${LIBPATH_ST:LIBPATH} ${DSHLIB_ST:LIB}'
run_str = '${D_LINKER} ${LINKFLAGS} ${DLNK_SRC_F}${SRC} ${DLNK_TGT_F:TGT} ${RPATH_ST:RPATH} ${DSTLIB_MARKER} ${DSTLIBPATH_ST:STLIBPATH} ${DSTLIB_ST:STLIB} ${DSHLIB_MARKER} ${DLIBPATH_ST:LIBPATH} ${DSHLIB_ST:LIB}'
inst_to = '${BINDIR}'
chmod = Utils.O755

10
waflib/Tools/dmd.py
View File

@ -64,7 +64,7 @@ def common_flags_dmd(conf):
v['D_HDR_F'] = '%s'
class d2program(ccroot.link_task):
run_str = '${D} ${LINKFLAGS} ${D2LINKFLAGS} ${SRC} ${DLNK_TGT_F:TGT}'
run_str = '${D} ${LINKFLAGS} ${D2LINKFLAGS} ${DINC_ST:INCPATHS} ${SRC} ${DLNK_TGT_F:TGT} ${DSTLIB_MARKER} ${DSTLIBPATH_ST:STLIBPATH} ${DSTLIB_ST:STLIB} ${DSHLIB_MARKER} ${DLIBPATH_ST:LIBPATH} ${DSHLIB_ST:LIB}'
inst_to = '${BINDIR}'
chmod = Utils.O755
@ -96,6 +96,14 @@ def configure(conf):
conf.env['d2stlib_PATTERN'] = 'lib%s.a'
conf.env.D2LINKFLAGS_dstlib = ['-lib']
#conf.env.DSTLIBPATH_ST = '-L%s'
conf.env.DSTLIB_ST = '-l'
conf.env.DINC_ST = '-I%s'
v = conf.env
v['DSHLIB_MARKER'] = v['DSTLIB_MARKER'] = ''
v['DSTLIB_ST'] = v['DSHLIB_ST'] = '-L-l%s'
v['DSTLIBPATH_ST'] = v['DLIBPATH_ST'] = '-L-L%s'
else:
conf.load('ar')
conf.load('d')