Index: msvc.jam =================================================================== --- msvc.jam (revision 80105) +++ msvc.jam (working copy) @@ -311,12 +311,18 @@ # -Cp preserve case of user identifiers # -Cx preserve case in publics, externs # -actions compile.asm +rule compile.asm ( targets + : sources * : properties * ) { - $(.ASM) -c -Zp4 -Cp -Cx -D$(DEFINES) $(ASMFLAGS) $(USER_ASMFLAGS) -Fo "$(<:W)" "$(>:W)" + get-rspline $(targets) : "-Zp4 -Cp -Cx" ; + compile-asm $(targets) : $(sources) ; } +actions compile-asm +{ + $(.ASM) @"@($(<[1]:W).rsp:E=$(ASM_RSPLINE) -Fo"$(<[1]:W)" $(>[1]:W)")" +} + rule compile.c ( targets + : sources * : properties * ) { C++FLAGS on $(targets[1]) = ; @@ -1054,6 +1060,9 @@ CC_RSPLINE on $(target) = [ on $(target) return $(lang-opt) -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(OPTIONS) -c $(.nl)-D$(DEFINES) $(.nl)\"-I$(INCLUDES:W)\" ] ; + + ASM_RSPLINE on $(target) = [ on $(target) return $(lang-opt) + $(ASMFLAGS) $(USER_ASMFLAGS) -c $(.nl)-D$(DEFINES) ] ; } class msvc-linking-generator : linking-generator @@ -1239,8 +1248,6 @@ toolset.flags msvc.compile.asm ASMFLAGS all : /W4 ; toolset.flags msvc.compile.asm ASMFLAGS on : /WX ; - toolset.flags msvc.compile.asm DEFINES ; - # Declare flags for linking. { toolset.flags msvc.link PDB_LINKFLAG on/database : /PDB: ; # not used yet