FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-10 20:29:10 +01:00
Code Issues Projects Releases Wiki Activity

#1055, add more asm variables

Browse Source
This commit is contained in:
Thomas Nagy 2011-10-16 18:19:31 +02:00
parent 76c8ff8126
commit 57627dc5e9
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,8 +1,10 @@
NEW IN WAF 1.6.9 NEW IN WAF 1.6.9
---------------- ----------------
* Fixed the duplicate moc file creation in slow_qt4 #1047 * Fixed the duplicate moc file creation in slow_qt4 #1047
* Fixed the Visual Studio 2008 projects creation #1033
* Added a workaround to avoid creating include folders not under the build directory #1049 * Added a workaround to avoid creating include folders not under the build directory #1049
* Added a default virtual folder structure for out-of-tree build files #1053 * Added a default virtual folder structure for out-of-tree build files #1053
* Added a way to set variants containing /, for example linux/debug
NEW IN WAF 1.6.8 NEW IN WAF 1.6.8
---------------- ----------------

2
demos/variants/wscript
View File

@ -43,7 +43,7 @@ def build(bld):
# #
# the config set 'debug' is loaded automatically when the 'debug' variant is used # the config set 'debug' is loaded automatically when the 'debug' variant is used
if not bld.variant: if not bld.variant:
bld.fatal('Call "waf build_debug" or "waf build_release", and look in the comments of the wscript file!') bld.fatal('Call "waf build_debug" or "waf build_release", and read the comments in the wscript file!')
# the includes='.' add the build directory path to the command arguments # the includes='.' add the build directory path to the command arguments
# (look at the -I flags by using waf -v) # (look at the -I flags by using waf -v)

2
waflib/Tools/asm.py
View File

@ -59,7 +59,7 @@ def asm_hook(self, node):
class asmprogram(link_task): class asmprogram(link_task):
"Link object files into a c program" "Link object files into a c program"
run_str = '${ASLINK} ${AS_TGT_F}${TGT} ${SRC}' run_str = '${ASLINK} ${ASLINKFLAGS} ${ASLNK_TGT_F}${TGT} ${ASLNK_SRC_F}${SRC}'
ext_out = ['.bin'] ext_out = ['.bin']
inst_to = '${BINDIR}' inst_to = '${BINDIR}'
chmod = Utils.O755 chmod = Utils.O755

3
waflib/Tools/gas.py
View File

@ -12,5 +12,6 @@ def configure(conf):
Find the programs gas/as/gcc and set the variable *AS* Find the programs gas/as/gcc and set the variable *AS*
""" """
conf.find_program(['gas', 'as', 'gcc'], var='AS') conf.find_program(['gas', 'as', 'gcc'], var='AS')
conf.env.AS_TGT_F = '-o' conf.env.AS_TGT_F = ['-o']
conf.env.ASLNK_TGT_F = ['-o']
conf.find_ar() conf.find_ar()

3
waflib/Tools/nasm.py
View File

@ -19,4 +19,5 @@ def configure(conf):
Detect nasm/yasm and set the variable *AS* Detect nasm/yasm and set the variable *AS*
""" """
nasm = conf.find_program(['nasm', 'yasm'], var='AS') nasm = conf.find_program(['nasm', 'yasm'], var='AS')
conf.env.AS_TGT_F = '-o' conf.env.AS_TGT_F = ['-o']
conf.env.ASLNK_TGT_F = ['-o']