diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | docs/templates/vc10.txt | 1 | ||||
| -rw-r--r-- | templates/vc10.mpd | 4 | ||||
| -rw-r--r-- | templates/vc1xdll.mpt | 2 | ||||
| -rw-r--r-- | templates/vc1xexe.mpt | 2 | ||||
| -rw-r--r-- | templates/vc7dll.mpt | 6 |
6 files changed, 23 insertions, 5 deletions
@@ -1,3 +1,16 @@ +Wed Nov 5 08:03:49 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/templates/vc10.txt: + * templates/vc10.mpd: + * templates/vc1xdll.mpt: + * templates/vc1xexe.mpt: + * templates/vc7dll.mpt: + With TAO we have the case that exe and dll have the same + name which causes problems with the pdb file. Add a new + use_pdb_modifier which we enable by default for vc1x, it + adds _dll to the pdb file for a dll, and _exe to the pdb + file for a exe + Wed Oct 8 13:41:24 UTC 2014 Chad Elliott <elliott_c@ociweb.com> * MPC version 4.1.0 released. diff --git a/docs/templates/vc10.txt b/docs/templates/vc10.txt index 6cc0f247..3c3fd9f7 100644 --- a/docs/templates/vc10.txt +++ b/docs/templates/vc10.txt @@ -173,6 +173,7 @@ useofatl = Specifies how ATL is used by the configuration (Static, Dynamic). useofmfc = Specifies how MFC is used by the configuration (Static, Dynamic). useunicodeforassemblerlisting = Causes the assembler listing output file to be created in UTF-8 format. useunicoderesponsefiles = Instructs the project system to generate Unicode response files when spawning the librarian. +use_pdb_modifier = A boolean value to determine whether the 'pdb_modifier' setting will be appended verbose = Verbose librarian option. warnaserror = Treats all compiler warnings as errors. warning_level = Numeric value for warning level (1-4, default is 3), or the strings "all" or "none" (0 is an alias for none). diff --git a/templates/vc10.mpd b/templates/vc10.mpd index 7c23e834..4a57a7c9 100644 --- a/templates/vc10.mpd +++ b/templates/vc10.mpd @@ -497,10 +497,10 @@ <%endif%> <%if(pdbl)%> <%if(sharedname)%> - <ProgramDatabaseFile>$(OutDir)\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(OutDir)\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%if(use_pdb_modifier)%><%pdb_modifier%><%endif%>.pdb</ProgramDatabaseFile> <%else%> <%if(exename)%> - <ProgramDatabaseFile>$(OutDir)\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%>.pdb</ProgramDatabaseFile> + <ProgramDatabaseFile>$(OutDir)\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%if(use_pdb_modifier)%><%pdb_modifier%><%endif%>.pdb</ProgramDatabaseFile> <%endif%> <%endif%> <%endif%> diff --git a/templates/vc1xdll.mpt b/templates/vc1xdll.mpt index e7a891b2..e11dc020 100644 --- a/templates/vc1xdll.mpt +++ b/templates/vc1xdll.mpt @@ -9,6 +9,8 @@ common_defines = WIN32 _WINDOWS _CRT_NONSTDC_NO_WARNINGS ConfigurationType = 2 MinimalRebuild = false GenerateDebugInformation = true +use_pdb_modifier = 1 +pdb_modifier = _dll Release { optimize = MaxSpeed diff --git a/templates/vc1xexe.mpt b/templates/vc1xexe.mpt index d07fa610..397a97db 100644 --- a/templates/vc1xexe.mpt +++ b/templates/vc1xexe.mpt @@ -10,6 +10,8 @@ ConfigurationType = 1 SubSystem = Console MinimalRebuild = false GenerateDebugInformation = true +use_pdb_modifier = 1 +pdb_modifier = _exe Release { LinkIncremental = 1 diff --git a/templates/vc7dll.mpt b/templates/vc7dll.mpt index 0e2fffea..47c8a5a0 100644 --- a/templates/vc7dll.mpt +++ b/templates/vc7dll.mpt @@ -4,9 +4,9 @@ conditional_include "common" conditional_include "windowscommon" -configurations = Debug Release -common_defines = WIN32 _WINDOWS -output_subdir = I386 +configurations = Debug Release +common_defines = WIN32 _WINDOWS +output_subdir = I386 Release { LinkIncremental = 1 |