diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 11:25:54 +0200 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 11:25:54 +0200 |
| commit | f920539cfcaf32813d390bfa501a08ea8bf8ec89 (patch) | |
| tree | 1b8d1d57e9b38d43d01c28521c2e34aff743adb5 /doc/user/libraries.xml | |
| parent | f9b265b27769aff6cff204cea5402d69ead3dda0 (diff) | |
| parent | ba4425ab5227fd9597fccd368bffff6bf1032149 (diff) | |
Merge commit 'upstream/2.1.0'
Diffstat (limited to 'doc/user/libraries.xml')
| -rw-r--r-- | doc/user/libraries.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/user/libraries.xml b/doc/user/libraries.xml index 3eed3cc..6909758 100644 --- a/doc/user/libraries.xml +++ b/doc/user/libraries.xml @@ -1,6 +1,6 @@ <!-- - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation + Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -206,6 +206,7 @@ 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) + embedManifestDllCheck(target, source, env) </screen> <para> @@ -288,6 +289,7 @@ lib /nologo /OUT:foo.lib f1.obj f2.obj f3.obj cl /Foprog.obj /c prog.c /nologo link /nologo /OUT:prog.exe /LIBPATH:. foo.lib bar.lib prog.obj + embedManifestExeCheck(target, source, env) </screen> <para> @@ -412,6 +414,7 @@ C:\><userinput>scons -Q</userinput> cl /Foprog.obj /c prog.c /nologo link /nologo /OUT:prog.exe /LIBPATH:\usr\lib /LIBPATH:\usr\local\lib m.lib prog.obj + embedManifestExeCheck(target, source, env) </screen> <!-- The link command is too wide in the PDF version. There are some other examples of this throughout the document. --> |