diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2010-09-13 21:13:59 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2010-09-13 21:13:59 +0000 |
| commit | 36d4b2f6b193265543fb6e733d9d3f0856add134 (patch) | |
| tree | cf949a06b4c6168076167ff4273dfc8621d5b0bd | |
| parent | 5c0340add3b337a3ec385e4123d628cdfefac3d5 (diff) | |
| download | MPC-36d4b2f6b193265543fb6e733d9d3f0856add134.tar.gz | |
ChangeLogTag: Mon Sep 13 21:11:20 UTC 2010 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | docs/USAGE | 2 | ||||
| -rw-r--r-- | docs/templates/vc10.txt | 2 | ||||
| -rw-r--r-- | templates/vc10.mpd | 4 |
4 files changed, 20 insertions, 4 deletions
@@ -1,3 +1,19 @@ +Mon Sep 13 21:11:20 UTC 2010 Adam Mitz <mitza@ociweb.com> + + * docs/USAGE: + + Fixed a typo. + + * docs/templates/vc10.txt: + + Removed a redundant \ from the OutDir. + Added warning_level settings for "all" and "none", adding to the + existing levels of 1-4. + + * templates/vc10.mpd: + + Documented warning levels. + Fri Sep 10 15:06:04 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> * config/xscdefaults.mpb: @@ -68,7 +68,7 @@ Usage: mwc.pl [-global <file>] [-include <directory>] [-recurse] -nocomments Do not place comments in the generated files. -noreldefs Do not try to generate default relative definitions. -notoplevel Do not generate the top level target file. Files - are still process, but no top level file is created. + are still processed, but no top level file is created. -recurse Recurse from the current directory and generate from all found input files. -relative Any $() variable in an mpc file that is matched to NAME diff --git a/docs/templates/vc10.txt b/docs/templates/vc10.txt index ea2941d7..a814a337 100644 --- a/docs/templates/vc10.txt +++ b/docs/templates/vc10.txt @@ -168,7 +168,7 @@ useunicodeforassemblerlisting = Causes the assembler listing output file to be c useunicoderesponsefiles = Instructs the project system to generate Unicode response files when spawning the librarian. verbose = Verbose librarian option. warnaserror = Treats all compiler warnings as errors. -warning_level = Numeric value for warning level (1-4, default is 3). +warning_level = Numeric value for warning level (1-4, default is 3), or the strings "all" or "none" (0 is an alias for none). wholeprogramoptimization = Enables cross-module optimizations by delaying code generation until link time but requires linktimecodegeneration to take effect (wholeprogramoptimization defaults to true in Release configurations). xml_version = XML version for the vcxproj (default 1.0) xmldocumentationfilename = Specifies the name of the compiler-generated XML documentation files; can be file or directory name. diff --git a/templates/vc10.mpd b/templates/vc10.mpd index 5de11f1c..11ce2bd9 100644 --- a/templates/vc10.mpd +++ b/templates/vc10.mpd @@ -85,7 +85,7 @@ <NMakeCleanCommandLine><%makeclean%> CONF=<%configuration%></NMakeOutput> <NMakeOutput><%makeoutput%></NMakeOutput> <%else%> - <OutDir Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(type_is_dynamic)%><%if(dllout)%><%dllout%>\<%else%><%libout%>\<%endif%><%else%><%if(type_is_static)%><%libout%>\<%else%><%if(exeout)%><%exeout%>\<%if(windows_style)%>\<%output_dir("Debug")%>\<%endif%><%else%><%if(windows_style)%><%output_dir("Debug")%>\<%else%><%output_dir(".")%>\<%endif%><%endif%><%endif%><%endif%></OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(type_is_dynamic)%><%if(dllout)%><%dllout%>\<%else%><%libout%>\<%endif%><%else%><%if(type_is_static)%><%libout%>\<%else%><%if(exeout)%><%exeout%>\<%if(windows_style)%><%output_dir("Debug")%>\<%endif%><%else%><%if(windows_style)%><%output_dir("Debug")%>\<%else%><%output_dir(".")%>\<%endif%><%endif%><%endif%><%endif%></OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%intermediate_dir%>\<%noextension(project_file)%>\<%if(output_subdir)%><%output_subdir%>\<%endif%></IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(debug_prj)%>true<%else%>false<%endif%></LinkIncremental> <TargetName Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(type_is_dynamic)%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%else%><%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%endif%></TargetName> @@ -265,7 +265,7 @@ <%if(BrowseInformationFile)%> <BrowseInformationFile><%BrowseInformationFile%></BrowseInformationFile> <%endif%> - <WarningLevel>Level<%warning_level("3")%></WarningLevel> + <WarningLevel><%if(compares(warning_level, all))%>EnableAllWarnings<%else%><%if(compares(warning_level, none) || compares(warning_level, 0))%>TurnOffAllWarnings<%else%>Level<%warning_level("3")%><%endif%><%endif%></WarningLevel> <%if(!managed && debug_format)%> <DebugInformationFormat><%debug_format%></DebugInformationFormat> <%endif%> |