ChangeLogTag: Tue Mar 2 12:28:09 2004 Chad Elliott <elliott_c@ociweb.com>

15 files changed, 47 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index c7c7f24086c..0f24c8070a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,30 @@
+Tue Mar  2 12:28:09 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/templates/bmake.mpd:
+        * bin/MakeProjectCreator/templates/bmakedllexe.mpt:
+        * bin/MakeProjectCreator/templates/bmakelibexe.mpt:
+        * bin/MakeProjectCreator/templates/em3vcp.mpd:
+        * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt:
+        * bin/MakeProjectCreator/templates/em3vcplibexe.mpt:
+        * bin/MakeProjectCreator/templates/nmake.mpd:
+        * bin/MakeProjectCreator/templates/nmakeexe.mpt:
+        * bin/MakeProjectCreator/templates/vc6dsp.mpd:
+        * bin/MakeProjectCreator/templates/vc6dspdllexe.mpt:
+        * bin/MakeProjectCreator/templates/vc6dsplibexe.mpt:
+        * bin/MakeProjectCreator/templates/vc7.mpd:
+        * bin/MakeProjectCreator/templates/vc7exe.mpt:
+        * bin/MakeProjectCreator/templates/vc7libexe.mpt:
+
+          Allow the user to generate projects with executable names with a
+          modifier for different configurations similar to the library
+          modifier for debug/release.  To enable this add '-value_template
+          use_modifier=1' to your MPC command line.
+
 Tue Mar  2 12:33:51 2004  Steve Huston  <shuston@riverace.com>
 
-	* m4/compiler.m4: Added HPUX_VERS to HP-UX compiler options, and
-	  -D_HPUX_SOURCE to aC++ options. This mirrors what the traditional
-	  platform options do.
+        * m4/compiler.m4: Added HPUX_VERS to HP-UX compiler options, and
+          -D_HPUX_SOURCE to aC++ options. This mirrors what the traditional
+          platform options do.
 
 Tue Mar  2 11:16:03 2004  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/bin/MakeProjectCreator/templates/bmake.mpd b/bin/MakeProjectCreator/templates/bmake.mpd
index e5db168b514..c0e942c17f8 100644
--- a/bin/MakeProjectCreator/templates/bmake.mpd
+++ b/bin/MakeProjectCreator/templates/bmake.mpd
@@ -11,6 +11,7 @@
 OCFLAGS      = <%if(optimize)%>-O2<%endif%><%foreach(defines)%> -D<%define%><%endfor%>
 INTERMEDIATE = <%intermediate_dir%>\<%noextension(project_file)%>
 LIBMODIFIER  = <%lib_modifier%>
+EXEMODIFIER  = <%if(use_modifier)%><%lib_modifier%><%endif%>
 <%if(postlinkrmext)%>
 POSTLINKRM   = <%postlinkrmext%>
 <%endif%>
@@ -39,7 +40,7 @@ LIBFLAGS     = <%libflags%>
 EXEFLAGS     = <%exeflags%>
 <%endfor%>
 <%if(exename)%>
-NAME         = <%exename%>
+NAME         = <%exename%>$(EXEMODIFIER)
 <%else%>
 <%if(sharedname)%>
 NAME         = <%sharedname%>$(LIBMODIFIER)
diff --git a/bin/MakeProjectCreator/templates/bmakedllexe.mpt b/bin/MakeProjectCreator/templates/bmakedllexe.mpt
index 94226eed55b..a77675d7fe7 100644
--- a/bin/MakeProjectCreator/templates/bmakedllexe.mpt
+++ b/bin/MakeProjectCreator/templates/bmakedllexe.mpt
@@ -3,7 +3,8 @@
 
 conditional_include "bmakecommon"
 
-startup_obj = c0x32$(OBJ_EXT)
+startup_obj  = c0x32$(OBJ_EXT)
+use_modifier =
 
 Release {
   optimize         = 1
diff --git a/bin/MakeProjectCreator/templates/bmakelibexe.mpt b/bin/MakeProjectCreator/templates/bmakelibexe.mpt
index a216d1b4297..f12eec63c7a 100644
--- a/bin/MakeProjectCreator/templates/bmakelibexe.mpt
+++ b/bin/MakeProjectCreator/templates/bmakelibexe.mpt
@@ -5,6 +5,7 @@ conditional_include "bmakecommon"
 
 need_staticflags = 1
 startup_obj      = c0x32$(OBJ_EXT)
+use_modifier     =
 
 Release {
   optimize         = 1
diff --git a/bin/MakeProjectCreator/templates/em3vcp.mpd b/bin/MakeProjectCreator/templates/em3vcp.mpd
index 40f38919502..70a0e798dd5 100644
--- a/bin/MakeProjectCreator/templates/em3vcp.mpd
+++ b/bin/MakeProjectCreator/templates/em3vcp.mpd
@@ -69,7 +69,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo <%if(sharedname || staticname)%>/o"<%libout%>\<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.bsc"<%endif%>
 <%if(type_is_binary)%>
 LINK32=link.exe
-# ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(pure_libs)%><%pure_lib%> <%endfor%><%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" <%stack%><%if(type_is_dynamic)%> /entry:"_DllMainCRTStartup"<%endif%> /nodefaultlib:"$(CENoDefaultLib)" /version:<%version("1.0")%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.pdb"<%endif%><%endif%><%endif%> <%if(type_is_dynamic)%> /dll<%endif%> <%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.exe<%endif%>"
+# ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(pure_libs)%><%pure_lib%> <%endfor%><%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" <%stack%><%if(type_is_dynamic)%> /entry:"_DllMainCRTStartup"<%endif%> /nodefaultlib:"$(CENoDefaultLib)" /version:<%version("1.0")%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.pdb"<%endif%><%endif%><%endif%> <%if(type_is_dynamic)%> /dll<%endif%> <%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe<%endif%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
index 122a41e7d61..caf918134a9 100644
--- a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
@@ -12,6 +12,7 @@ type_is_binary        = 1
 common_defines        = UNICODE _UNICODE
 pdb                   = 1
 stack                 =
+use_modifier          =
 
 WCE x86 {
   type_code   = 0x8301
diff --git a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
index c46305b413c..199c28d17ad 100644
--- a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
@@ -13,6 +13,7 @@ common_defines        = UNICODE _UNICODE
 need_staticflags      = 1
 pdb                   = 1
 stack                 =
+use_modifier          =
 
 WCE x86 {
   type_code   = 0x8301
diff --git a/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd
index 70e54b17f06..f6b43fe76f3 100644
--- a/bin/MakeProjectCreator/templates/nmake.mpd
+++ b/bin/MakeProjectCreator/templates/nmake.mpd
@@ -48,7 +48,7 @@ OUTDIR=<%libout%>
 <%endif%>
 INTDIR=<%intermediate_dir%>\<%noextension(project_file)%>
 
-ALL : <%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%foreach(custom_type->input_file->output_files)%> "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>"<%endfor%><%endfor%><%endfor%>
+ALL : <%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe<%endif%>"<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%foreach(custom_type->input_file->output_files)%> "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>"<%endfor%><%endfor%><%endfor%>
 
 DEPEND :
 	<%depgen("perl $(ACE_ROOT)\\bin\\depgen.pl")%><%foreach(includes)%> -I"<%include%>"<%endfor%><%foreach(defines cpu_defines common_defines macros)%> -D<%define%><%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%> -D<%dynamicflag%><%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%> -D<%staticflag%><%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%> -f "<%noextension(project_file)%>.dep"<%foreach(source_files)%> <%source_file%><%endfor%>
@@ -62,7 +62,7 @@ CLEAN :
 REALCLEAN : CLEAN
 <%if(pdb)%>
 <%if(exename)%>
-	-@erase "$(INSTALLDIR)\<%exename%>.pdb"
+	-@erase "$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.pdb"
 <%endif%>
 <%if(type_is_dynamic)%>
 	-@erase "$(OUTDIR)\<%sharedname%><%lib_modifier%>.pdb"
@@ -75,8 +75,8 @@ REALCLEAN : CLEAN
         -@erase "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll"
 <%endif%>
 <%if(exename)%>
-        -@erase "$(INSTALLDIR)\<%exename%>.exe"
-        -@erase "$(INSTALLDIR)\<%exename%>.ilk"
+        -@erase "$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe"
+        -@erase "$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.ilk"
 <%else%>
         -@erase "$(OUTDIR)\<%staticname%><%lib_modifier%>.lib"
         -@erase "$(OUTDIR)\<%staticname%><%lib_modifier%>.exp"
@@ -145,7 +145,7 @@ BSC32_SBRS= \
 
 <%if(type_is_binary)%>
 LINK32=link.exe
-LINK32_FLAGS=<%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(pure_libs)%><%pure_lib%> <%endfor%><%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%>/pdb:"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.pdb<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.pdb<%endif%>" <%endif%>/machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%if(sharedname)%> /implib:"$(OUTDIR)\<%sharedname%><%lib_modifier%>.lib"<%endif%>
+LINK32_FLAGS=<%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(pure_libs)%><%pure_lib%> <%endfor%><%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%>/pdb:"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.pdb<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.pdb<%endif%>" <%endif%>/machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe<%endif%>"<%if(sharedname)%> /implib:"$(OUTDIR)\<%sharedname%><%lib_modifier%>.lib"<%endif%>
 <%endif%>
 <%if(type_is_static)%>
 LINK32=link.exe -lib
@@ -164,7 +164,7 @@ LINK32_OBJS= \
 <%endfor%>
 <%endif%>
 
-"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe<%endif%>" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
diff --git a/bin/MakeProjectCreator/templates/nmakeexe.mpt b/bin/MakeProjectCreator/templates/nmakeexe.mpt
index cf807a29dc3..0cb7f501b89 100644
--- a/bin/MakeProjectCreator/templates/nmakeexe.mpt
+++ b/bin/MakeProjectCreator/templates/nmakeexe.mpt
@@ -12,6 +12,7 @@ type_is_binary        = 1
 common_defines        = WIN32 _CONSOLE
 subsystem             = console
 pdb                   = 1
+use_modifier          =
 
 Win32 {
   machine_description = x86
diff --git a/bin/MakeProjectCreator/templates/vc6dsp.mpd b/bin/MakeProjectCreator/templates/vc6dsp.mpd
index eb4963bd54f..101102f791d 100644
--- a/bin/MakeProjectCreator/templates/vc6dsp.mpd
+++ b/bin/MakeProjectCreator/templates/vc6dsp.mpd
@@ -61,7 +61,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo <%if(sharedname || staticname)%>/o"<%libout%>\<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.bsc"<%endif%>
 <%if(type_is_binary)%>
 LINK32=link.exe
-# ADD LINK32 <%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(pure_libs)%><%pure_lib%> <%endfor%><%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.pdb"<%endif%><%endif%><%endif%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> /machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.exe<%endif%>"
+# ADD LINK32 <%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(pure_libs)%><%pure_lib%> <%endfor%><%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.pdb"<%endif%><%endif%><%endif%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> /machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe<%endif%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt b/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt
index 896d820814a..c311d76b365 100644
--- a/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt
+++ b/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt
@@ -10,6 +10,7 @@ type_is_binary   = 1
 common_defines   = WIN32 _CONSOLE
 subsystem        = console
 pdb              = 1
+use_modifier     =
 
 Release {
   use_debug_libraries   = 0
diff --git a/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt b/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt
index bd768f060ec..9e97a1f34b1 100644
--- a/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt
+++ b/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt
@@ -12,7 +12,7 @@ common_defines        = WIN32 _CONSOLE
 subsystem             = console
 need_staticflags      = 1
 pdb                   = 1
-
+use_modifier          =
 
 Release {
   use_debug_libraries   = 0
diff --git a/bin/MakeProjectCreator/templates/vc7.mpd b/bin/MakeProjectCreator/templates/vc7.mpd
index bac93c9f9ae..9fe871e42f6 100644
--- a/bin/MakeProjectCreator/templates/vc7.mpd
+++ b/bin/MakeProjectCreator/templates/vc7.mpd
@@ -68,7 +68,7 @@
 				AdditionalDependencies="<%foreach(pure_libs)%><%pure_lib%> <%endfor%><%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib<%fornotlast(" ")%><%endfor%>"
 <%endif%>
 <%if(exename || sharedname || staticname)%>
-				OutputFile="$(OutDir)/<%if(type_is_dynamic)%><%sharedname%><%lib_modifier%>.dll<%else%><%exename%>.exe<%endif%>"
+				OutputFile="$(OutDir)/<%if(type_is_dynamic)%><%sharedname%><%lib_modifier%>.dll<%else%><%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe<%endif%>"
 <%endif%>
 				Version="<%version("1.0")%>"
 				LinkIncremental="<%LinkIncremental("1")%>"
@@ -79,7 +79,7 @@
 				ProgramDatabaseFile="$(OutDir)/<%sharedname%><%lib_modifier%>.pdb"
 <%else%>
    <%if(type_is_binary)%>
-				ProgramDatabaseFile="$(OutDir)/<%exename%>.pdb"
+				ProgramDatabaseFile="$(OutDir)/<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.pdb"
    <%endif%>
 <%endif%>
 				SubSystem="<%subsystem("1")%>"
diff --git a/bin/MakeProjectCreator/templates/vc7exe.mpt b/bin/MakeProjectCreator/templates/vc7exe.mpt
index 8a13e7549d5..fe9b887308d 100644
--- a/bin/MakeProjectCreator/templates/vc7exe.mpt
+++ b/bin/MakeProjectCreator/templates/vc7exe.mpt
@@ -9,6 +9,7 @@ common_defines     = WIN32 _CONSOLE
 configuration_type = 1
 subsystem          = 1
 pdb                = 1
+use_modifier       =
 
 Release {
   optimize         = 3
diff --git a/bin/MakeProjectCreator/templates/vc7libexe.mpt b/bin/MakeProjectCreator/templates/vc7libexe.mpt
index a77af6f8c65..d74b5101bea 100644
--- a/bin/MakeProjectCreator/templates/vc7libexe.mpt
+++ b/bin/MakeProjectCreator/templates/vc7libexe.mpt
@@ -9,6 +9,7 @@ common_defines     = WIN32 _CONSOLE
 configuration_type = 1
 subsystem          = 1
 pdb                = 1
+use_modifier       =
 
 Static Release {
   optimize         = 3