#1055, add more asm variables

ChangeLog

@@ -1,8 +1,10 @@
 NEW IN WAF 1.6.9
 ----------------
 * 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 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
 ----------------

demos/variants/wscript

@@ -43,7 +43,7 @@ def build(bld):
 	#
 	# the config set 'debug' is loaded automatically when the 'debug' variant is used
 	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
 	# (look at the -I flags by using waf -v)

waflib/Tools/asm.py

@@ -59,7 +59,7 @@ def asm_hook(self, node):
 
 class asmprogram(link_task):
 	"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']
 	inst_to = '${BINDIR}'
 	chmod   = Utils.O755

waflib/Tools/gas.py

@@ -12,5 +12,6 @@ def configure(conf):
 	Find the programs gas/as/gcc and set the variable *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()

waflib/Tools/nasm.py

@@ -19,4 +19,5 @@ def configure(conf):
 	Detect nasm/yasm and set the variable *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']