summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/user/add-method.xml2
-rw-r--r--doc/user/builders-built-in.xml4
-rw-r--r--doc/user/depends.xml2
-rw-r--r--doc/user/less-simple.xml8
-rw-r--r--doc/user/libraries.xml22
-rw-r--r--doc/user/main.xml1
-rw-r--r--doc/user/nodes.xml6
-rw-r--r--doc/user/parseflags.xml2
-rw-r--r--doc/user/simple.xml10
-rw-r--r--doc/user/troubleshoot.xml13
-rw-r--r--doc/user/variants.xml4
11 files changed, 37 insertions, 37 deletions
diff --git a/doc/user/add-method.xml b/doc/user/add-method.xml
index e6f2a67..d4a484e 100644
--- a/doc/user/add-method.xml
+++ b/doc/user/add-method.xml
@@ -111,7 +111,7 @@
<screen>
C:\><userinput>scons -Q</userinput>
rc /fores.res res.rc
- cl /nologo /c test_stuff.c /Fotest_stuff.obj
+ cl /Fotest_stuff.obj /c test_stuff.c /nologo
link /nologo /OUT:tests\test_stuff.exe test_stuff.obj res.res
</screen>
diff --git a/doc/user/builders-built-in.xml b/doc/user/builders-built-in.xml
index cf09fd5..738683b 100644
--- a/doc/user/builders-built-in.xml
+++ b/doc/user/builders-built-in.xml
@@ -157,8 +157,8 @@
<screen>
C:\><userinput>scons -Q</userinput>
- cl /nologo /c goodbye.c /Fogoodbye.obj
- cl /nologo /c hello.c /Fohello.obj
+ cl /Fogoodbye.obj /c goodbye.c /nologo
+ cl /Fohello.obj /c hello.c /nologo
link /nologo /OUT:hello.exe /LIBPATH:\usr\dir1 /LIBPATH:dir2 foo1.lib foo2.lib hello.obj goodbye.obj
</screen>
diff --git a/doc/user/depends.xml b/doc/user/depends.xml
index 39866e2..512ac68 100644
--- a/doc/user/depends.xml
+++ b/doc/user/depends.xml
@@ -990,7 +990,7 @@
<screen>
C:\><userinput>scons -Q hello.exe</userinput>
- cl /nologo /Iinclude /I\home\project\inc /c hello.c /Fohello.obj
+ cl /Fohello.obj /c hello.c /nologo /Iinclude /I\home\project\inc
link /nologo /OUT:hello.exe hello.obj
</screen>
diff --git a/doc/user/less-simple.xml b/doc/user/less-simple.xml
index 35b6b60..28fc053 100644
--- a/doc/user/less-simple.xml
+++ b/doc/user/less-simple.xml
@@ -100,7 +100,7 @@
<screen>
C:\><userinput>scons -Q</userinput>
- cl /nologo /c hello.c /Fohello.obj
+ cl /Fohello.obj /c hello.c /nologo
link /nologo /OUT:new_hello.exe hello.obj
</screen>
@@ -189,9 +189,9 @@
<screen>
C:\><userinput>scons -Q</userinput>
- cl /nologo /c file1.c /Fofile1.obj
- cl /nologo /c file2.c /Fofile2.obj
- cl /nologo /c prog.c /Foprog.obj
+ cl /Fofile1.obj /c file1.c /nologo
+ cl /Fofile2.obj /c file2.c /nologo
+ cl /Foprog.obj /c prog.c /nologo
link /nologo /OUT:program.exe prog.obj file1.obj file2.obj
</screen>
diff --git a/doc/user/libraries.xml b/doc/user/libraries.xml
index da7d835..1fa06af 100644
--- a/doc/user/libraries.xml
+++ b/doc/user/libraries.xml
@@ -73,9 +73,9 @@
<screen>
C:\><userinput>scons -Q</userinput>
- cl /nologo /c f1.c /Fof1.obj
- cl /nologo /c f2.c /Fof2.obj
- cl /nologo /c f3.c /Fof3.obj
+ cl /Fof1.obj /c f1.c /nologo
+ cl /Fof2.obj /c f2.c /nologo
+ cl /Fof3.obj /c f3.c /nologo
lib /nologo /OUT:foo.lib f1.obj f2.obj f3.obj
</screen>
@@ -201,9 +201,9 @@
<screen>
C:\><userinput>scons -Q</userinput>
- cl /nologo /c f1.c /Fof1.obj
- cl /nologo /c f2.c /Fof2.obj
- cl /nologo /c f3.c /Fof3.obj
+ cl /Fof1.obj /c f1.c /nologo
+ cl /Fof2.obj /c f2.c /nologo
+ cl /Fof3.obj /c f3.c /nologo
link /nologo /dll /out:foo.dll /implib:foo.lib f1.obj f2.obj f3.obj
RegServerFunc(target, source, env)
</screen>
@@ -282,11 +282,11 @@
<screen>
C:\><userinput>scons -Q</userinput>
- cl /nologo /c f1.c /Fof1.obj
- cl /nologo /c f2.c /Fof2.obj
- cl /nologo /c f3.c /Fof3.obj
+ cl /Fof1.obj /c f1.c /nologo
+ cl /Fof2.obj /c f2.c /nologo
+ cl /Fof3.obj /c f3.c /nologo
lib /nologo /OUT:foo.lib f1.obj f2.obj f3.obj
- cl /nologo /c prog.c /Foprog.obj
+ cl /Foprog.obj /c prog.c /nologo
link /nologo /OUT:prog.exe /LIBPATH:. foo.lib bar.lib prog.obj
</screen>
@@ -410,7 +410,7 @@
<screen>
C:\><userinput>scons -Q</userinput>
- cl /nologo /c prog.c /Foprog.obj
+ cl /Foprog.obj /c prog.c /nologo
link /nologo /OUT:prog.exe /LIBPATH:\usr\lib /LIBPATH:\usr\local\lib m.lib prog.obj
</screen>
<!-- The link command is too wide in the PDF version.
diff --git a/doc/user/main.xml b/doc/user/main.xml
index 181b2a8..4c2c1b8 100644
--- a/doc/user/main.xml
+++ b/doc/user/main.xml
@@ -104,7 +104,6 @@
XXX ParseDepends()
XXX Platform()
XXX SConsignFile()
- XXX SideEffect()
XXX Tools()
XXX GetOption('duplicate')
diff --git a/doc/user/nodes.xml b/doc/user/nodes.xml
index 4ada5b7..28af973 100644
--- a/doc/user/nodes.xml
+++ b/doc/user/nodes.xml
@@ -128,8 +128,8 @@
<screen>
C:\><userinput>scons -Q</userinput>
- cl -DGOODBYE /c goodbye.c /Fogoodbye.obj
- cl -DHELLO /c hello.c /Fohello.obj
+ cl /Fogoodbye.obj /c goodbye.c -DGOODBYE
+ cl /Fohello.obj /c hello.c -DHELLO
link /nologo /OUT:hello.exe hello.obj goodbye.obj
</screen>
@@ -268,7 +268,7 @@
C:\><userinput>scons -Q</userinput>
The object file is: hello.obj
The program file is: hello.exe
- cl /nologo /c hello.c /Fohello.obj
+ cl /Fohello.obj /c hello.c /nologo
link /nologo /OUT:hello.exe hello.obj
</screen>
diff --git a/doc/user/parseflags.xml b/doc/user/parseflags.xml
index e52bd78..632077e 100644
--- a/doc/user/parseflags.xml
+++ b/doc/user/parseflags.xml
@@ -91,7 +91,7 @@
CPPPATH ['/opt/include']
LIBPATH ['/opt/lib']
LIBS ['foo']
- cl /nologo /I\opt\include /c f1.c /Fof1.obj
+ cl /Fof1.obj /c f1.c /nologo /I\opt\include
link /nologo /OUT:f1.exe /LIBPATH:\opt\lib foo.lib f1.obj
</screen>
diff --git a/doc/user/simple.xml b/doc/user/simple.xml
index 4e4ff0e..8245237 100644
--- a/doc/user/simple.xml
+++ b/doc/user/simple.xml
@@ -108,7 +108,7 @@
scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
- cl /nologo /c hello.c /Fohello.obj
+ cl /Fohello.obj /c hello.c /nologo
link /nologo /OUT:hello.exe hello.obj
scons: done building targets.
</screen>
@@ -195,7 +195,7 @@
scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
- cl /nologo /c hello.c /Fohello.obj
+ cl /Fohello.obj /c hello.c /nologo
scons: done building targets.
</screen>
@@ -298,7 +298,7 @@
scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
- cl /nologo /c hello.c /Fohello.obj
+ cl /Fohello.obj /c hello.c /nologo
link /nologo /OUT:hello.exe hello.obj
scons: done building targets.
C:\><userinput>scons -c</userinput>
@@ -505,7 +505,7 @@
scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
- cl /nologo /c hello.c /Fohello.obj
+ cl /Fohello.obj /c hello.c /nologo
link /nologo /OUT:hello.exe hello.obj
scons: done building targets.
</screen>
@@ -534,7 +534,7 @@
<screen>
C:\><userinput>scons -Q</userinput>
- cl /nologo /c hello.c /Fohello.obj
+ cl /Fohello.obj /c hello.c /nologo
link /nologo /OUT:hello.exe hello.obj
</screen>
diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml
index 2d525b9..75079d9 100644
--- a/doc/user/troubleshoot.xml
+++ b/doc/user/troubleshoot.xml
@@ -341,7 +341,6 @@
{ 'BUILDERS': {'_InternalInstall': &lt;function InstallBuilderWrapper at 0x700000&gt;, 'Object': &lt;SCons.Builder.CompositeBuilder instance at 0x700000&gt;, 'PCH': &lt;SCons.Builder.BuilderBase instance at 0x700000&gt;, 'RES': &lt;SCons.Builder.BuilderBase instance at 0x700000&gt;, 'SharedObject': &lt;SCons.Builder.CompositeBuilder instance at 0x700000&gt;, 'StaticObject': &lt;SCons.Builder.CompositeBuilder instance at 0x700000&gt;, '_InternalInstallAs': &lt;function InstallAsBuilderWrapper at 0x700000&gt;},
'CC': 'cl',
'CCCOM': &lt;SCons.Action.FunctionAction instance at 0x700000&gt;,
- 'CCCOMFLAGS': '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo$TARGET $CCPCHFLAGS $CCPDBFLAGS',
'CCFLAGS': ['/nologo'],
'CCPCHFLAGS': ['${(PCH and "/Yu%s /Fp%s"%(PCHSTOP or "",File(PCH))) or ""}'],
'CCPDBFLAGS': ['${(PDB and "/Z7") or ""}'],
@@ -371,7 +370,7 @@
'.spp',
'.SPP'],
'CXX': '$CC',
- 'CXXCOM': '$CXX $CXXFLAGS $CCCOMFLAGS',
+ 'CXXCOM': '$CXX /Fo$TARGET /c $SOURCES $CXXFLAGS $CCFLAGS $_CCCOMCOM',
'CXXFILESUFFIX': '.cc',
'CXXFLAGS': ['$CCFLAGS', '$(', '/TP', '$)'],
'DSUFFIXES': ['.d'],
@@ -407,6 +406,7 @@
'RC': 'rc',
'RCCOM': &lt;SCons.Action.FunctionAction instance at 0x700000&gt;,
'RCFLAGS': [],
+ 'RCSUFFIXES': ['.rc', '.rc2'],
'RDirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0x700000&gt;,
'SCANNERS': [],
'SHCC': '$CC',
@@ -414,7 +414,7 @@
'SHCCFLAGS': ['$CCFLAGS'],
'SHCFLAGS': ['$CFLAGS'],
'SHCXX': '$CXX',
- 'SHCXXCOM': '$SHCXX $SHCXXFLAGS $CCCOMFLAGS',
+ 'SHCXXCOM': '$SHCXX /Fo$TARGET /c $SOURCES $SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM',
'SHCXXFLAGS': ['$CXXFLAGS'],
'SHELL': None,
'SHLIBPREFIX': '',
@@ -426,6 +426,7 @@
'TEMPFILE': &lt;class SCons.Platform.TempFileMunge at 0x700000&gt;,
'TEMPFILEPREFIX': '@',
'TOOLS': ['msvc', 'install', 'install'],
+ '_CCCOMCOM': '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $CCPCHFLAGS $CCPDBFLAGS',
'_CPPDEFFLAGS': '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__)}',
'_CPPINCFLAGS': '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
'_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
@@ -1115,9 +1116,9 @@
% <userinput>scons -Q --debug=stacktrace</userinput>
scons: *** Source `prog.c' not found, needed by target `prog.o'. Stop.
scons: internal stack trace:
- File "bootstrap/src/engine/SCons/Job.py", line 198, in start
- File "bootstrap/src/engine/SCons/Script/Main.py", line 169, in prepare
- File "bootstrap/src/engine/SCons/Taskmaster.py", line 184, in prepare
+ File "bootstrap/src/engine/SCons/Job.py", line 197, in start
+ File "bootstrap/src/engine/SCons/Script/Main.py", line 167, in prepare
+ File "bootstrap/src/engine/SCons/Taskmaster.py", line 182, in prepare
File "bootstrap/src/engine/SCons/Executor.py", line 171, in prepare
</screen>
diff --git a/doc/user/variants.xml b/doc/user/variants.xml
index 3b570cd..3ae3e4a 100644
--- a/doc/user/variants.xml
+++ b/doc/user/variants.xml
@@ -109,8 +109,8 @@ is pretty smart about rebuilding things when you change options.
<screen>
C:\><userinput>scons -Q OS=windows</userinput>
Install file: "build/windows/world/world.h" as "export/windows/include/world.h"
- cl /nologo /Iexport\windows\include /c build\windows\hello\hello.c /Fobuild\windows\hello\hello.obj
- cl /nologo /Iexport\windows\include /c build\windows\world\world.c /Fobuild\windows\world\world.obj
+ cl /Fobuild\windows\hello\hello.obj /c build\windows\hello\hello.c /nologo /Iexport\windows\include
+ cl /Fobuild\windows\world\world.obj /c build\windows\world\world.c /nologo /Iexport\windows\include
lib /nologo /OUT:build\windows\world\world.lib build\windows\world\world.obj
Install file: "build/windows/world/world.lib" as "export/windows/lib/world.lib"
link /nologo /OUT:build\windows\hello\hello.exe /LIBPATH:export\windows\lib world.lib build\windows\hello\hello.obj
generated by cgit v0.12 at 2024-11-30 10:50:53 (GMT)