ChangeLogTag: Fri Jun 24 12:47:06 2005 Chad Elliott <elliott_c@ociweb.com>

8 files changed, 76 insertions, 763 deletions

diff --git a/ChangeLog b/ChangeLog
index 618b714c..ac1095d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Fri Jun 24 12:47:06 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * PROBLEM-REPORT-FORM:
+
+          Adding a problem report form with requirements for submitting a
+          support request.
+
+        * modules/EM3ProjectCreator.pm:
+        * modules/VC6ProjectCreator.pm:
+
+          Removing the implementation of the get_template method since I
+          have renamed the templates for these project types.
+
+        * modules/MakeWorkspaceCreator.pm:
+
+          Removed the setting of PWD since it isn't used in the project
+          makefiles anymore.
+
+        * templates/make.mpd:
+
+        * templates/em3.mpd:
+        * templates/vc6.mpd:
+        * templates/em3vcp.mpd:
+        * templates/vc6dsp.mpd:
+
+          Renamed vc6dsp.mpd to vc6.mpd and em3vcp.mpd to em3.mpd.
+
 Fri Jun 24 08:39:56 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * templates/em3vcp.mpd:
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
new file mode 100644
index 00000000..03830ceb
--- /dev/null
+++ b/PROBLEM-REPORT-FORM
@@ -0,0 +1,26 @@
+Documentation for MPC can be found at the following location.
+
+  http://downloads.ociweb.com/MPC/
+
+Please consult the documentation to ensure that you are using MPC correctly.
+
+If you are still having a problem getting MPC to do what you want, please
+consult the FAQ before sending a support request.
+
+  http://www.ociweb.com/product/mpc/faq.html
+
+When requesting MPC support please provide the following items:
+
+  MPC version (using mwc.pl -version):
+
+  ACE or TAO version (if using either):
+
+  The contents of default.features (if any):
+
+  MPC command line options:
+
+  Problem description (please be as detailed as possible):
+
+Finally, send support requests to support@ociweb.com.  You may send
+questions to the author (elliott_c@ociweb.com), but a response is not
+guaranteed.
diff --git a/modules/EM3ProjectCreator.pm b/modules/EM3ProjectCreator.pm
index 5e23af0d..56e536f9 100644
--- a/modules/EM3ProjectCreator.pm
+++ b/modules/EM3ProjectCreator.pm
@@ -51,10 +51,4 @@ sub get_dll_template_input_file {
 }
 
 
-sub get_template {
-  #my($self) = shift;
-  return 'em3vcp';
-}
-
-
 1;
diff --git a/modules/MakeWorkspaceCreator.pm b/modules/MakeWorkspaceCreator.pm
index b6984ab0..ecd101a9 100644
--- a/modules/MakeWorkspaceCreator.pm
+++ b/modules/MakeWorkspaceCreator.pm
@@ -84,7 +84,7 @@ sub write_comps {
     my($dname) = $self->mpc_dirname($project);
     print $fh "\t\@",
               ($dname ne '.' ? "cd $dname; " : ''),
-              "\$(MAKE) PWD=`pwd` -f ",
+              "\$(MAKE) -f ",
               ($dname eq '.' ? $project : basename($project)),
               " \$(\@)$crlf";
   }
@@ -102,7 +102,7 @@ sub write_comps {
     print $fh $crlf,
               "\t\@",
               ($dname ne '.' ? "cd $dname; " : ''),
-              "\$(MAKE) PWD=`pwd` -f ",
+              "\$(MAKE) -f ",
               ($dname eq '.' ? $project : basename($project)),
               ' generated all', $crlf;
   }
diff --git a/modules/VC6ProjectCreator.pm b/modules/VC6ProjectCreator.pm
index 918a5b20..d526335f 100644
--- a/modules/VC6ProjectCreator.pm
+++ b/modules/VC6ProjectCreator.pm
@@ -79,10 +79,4 @@ sub get_dll_template_input_file {
 }
 
 
-sub get_template {
-  #my($self) = shift;
-  return 'vc6dsp';
-}
-
-
 1;
diff --git a/templates/em3vcp.mpd b/templates/em3vcp.mpd
deleted file mode 100644
index c4ad0000..00000000
--- a/templates/em3vcp.mpd
+++ /dev/null
@@ -1,375 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="<%project_name%>" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-<%foreach(platforms)%>
-# TARGTYPE "<%operating_system("Win32")%> (<%platform%>) <%if(exename || sharedname || staticname)%><%if(type_is_static && staticname)%>Static Library<%else%><%type_description%><%endif%>" <%type_code%><%else%>Generic Project" 0x010a<%endif%>
-<%endfor%>
-
-CFG=<%project_name%> - <%operating_system("Win32")%> (<%default_platform%>) <%default_configuration%>
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type.  You can then use the following command:
-!MESSAGE
-!MESSAGE NMAKE.
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE CFG="<%project_name%> - <%operating_system%> (<%default_platform%>) <%default_configuration%>"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-<%foreach(platforms)%>
-<%foreach(configurations)%>
-!MESSAGE "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>" (based on "<%operating_system%> (<%platform%>) <%if(exename || sharedname || staticname)%><%if(type_is_static && staticname)%>Static Library<%else%><%type_description%><%endif%><%else%>Generic Project<%endif%>")
-<%endfor%>
-<%endfor%>
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project <%atl_project("2")%>
-
-<%foreach(platforms)%>
-<%foreach(configurations)%>
-!<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
-
-# PROP Use_MFC <%use_mfc("0")%>
-# PROP Use_Debug_Libraries <%use_debug_libraries("1")%>
-<%if(exename)%>
-# PROP Output_Dir "<%output_dir%>\<%machine%>"
-<%endif%>
-<%if(type_is_static)%>
-# PROP Output_Dir "<%output_dir%>\<%machine%>"
-<%endif%>
-<%if(type_is_dynamic)%>
-# PROP Output_Dir "<%libout%>\<%machine%>"
-<%endif%>
-# PROP Intermediate_Dir "<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>"
-# PROP CPU_ID "{<%cpu_id%>}"
-# PROP Platform_ID "{<%platform_id%>}"
-<%if(type_is_dynamic)%>
-# PROP Ignore_Export_Lib 0
-<%endif%>
-# PROP Target_Dir ""
-<%if(type_is_static)%>
-LINK32=link.exe -lib
-<%endif%>
-RSC=rc.exe
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CePlatform)"<%foreach(defines common_defines cpu_defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> /r
-CPP=<%cpp("cl.exe")%>
-# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%><%if(pdbc)%> /Fd"<%if(type_is_static)%><%libout%>\<%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb<%else%><%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>/<%endif%>"<%endif%> <%cpu_options%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_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%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%noextension(pch_header)%>.pch" <%endif%> /FD /Gy /c
-<%if(compile_flags_removed)%>
-# SUBTRACT CPP <%compile_flags_removed%>
-<%endif%>
-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")%><%if(link_options)%> <%link_options%><%endif%> /INCREMENTAL:<%incremental("NO")%> <%foreach(reverse(libs))%><%lib%><%lib_modifier%><%lib_ext%> <%endfor%><%foreach(reverse(lit_libs))%><%lit_lib%>.lib <%endfor%><%foreach(reverse(pure_libs))%><%pure_lib%> <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" <%if(type_is_dynamic)%> /implib:"<%libout%>\<%machine%>\<%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>" /entry:"_DllMainCRTStartup"<%endif%> /nodefaultlib:"$(CENoDefaultLib)"<%if(win_version)%> /version:<%win_version%><%endif%><%if(StackReserveSize)%> /stack:<%StackReserveSize%><%if(StackCommitSize)%>,<%StackCommitSize%><%endif%><%endif%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdbl)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%>.pdb"<%endif%><%endif%><%else%> /pdb:none<%endif%> <%if(type_is_dynamic)%> <%if(!source_files)%>/noentry <%endif%>/dll<%endif%> <%if(unicode && unicode_mfc_entry && exename && source_files)%>/entry:"<%unicode_mfc_entry%>" <%endif%><%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%><%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%><%endif%>"
-<%if(link_flags_removed)%>
-# SUBTRACT LINK32 <%link_flags_removed%>
-<%endif%>
-<%endif%>
-<%if(type_is_static)%>
-LIB32=link.exe -lib
-# ADD LIB32 /nologo /out:"<%libout%>\<%machine%>\<%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>"
-<%endif%>
-<%if(postbuild)%>
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=<%eval(postbuild)%>
-# End Special Build Tool
-<%endif%>
-
-<%endfor%>
-!ENDIF
-<%endfor%>
-
-
-# Begin Target
-
-<%foreach(platforms)%>
-<%foreach(configurations)%>
-# Name "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
-<%endfor%>
-<%endfor%>
-<%if(exename || sharedname || staticname)%>
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;cxx;c"
-<%if(pch_source)%>
-<%if(pch_header)%>
-# Begin Source File
-
-SOURCE="<%pch_source%>"
-# ADD CPP /Yc"<%pch_header%>"
-# End Source File
-<%endif%>
-<%endif%>
-<%if(grouped_source_files)%>
-<%foreach(grouped_source_files)%>
-# Begin Group "<%grouped_source_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_source_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_source_file->file%>"
-<%if(duplicate_index(grouped_source_file->file))%>
-<%foreach(platforms)%>
-<%foreach(configurations)%>
-!<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%basenoextension(grouped_source_file->file)%><%duplicate_index(grouped_source_file->file)%>.obj"
-<%endfor%>
-!ENDIF
-<%endfor%>
-<%endif%>
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(source_files)%>
-# Begin Source File
-
-SOURCE="<%source_file%>"
-<%if(duplicate_index(source_file))%>
-<%foreach(platforms)%>
-<%foreach(configurations)%>
-!<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%machine%>\<%basenoextension(source_file)%><%duplicate_index(source_file)%>.obj"
-<%endfor%>
-!ENDIF
-<%endfor%>
-<%endif%>
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%if(header_files)%>
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hh"
-<%if(pch_header)%>
-# Begin Source File
-
-SOURCE="<%pch_header%>"
-# End Source File
-<%endif%>
-<%if(grouped_header_files)%>
-<%foreach(grouped_header_files)%>
-# Begin Group "<%grouped_header_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_header_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_header_file->file%>"
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(header_files)%>
-# Begin Source File
-
-SOURCE="<%header_file%>"
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%if(inline_files)%>
-# Begin Group "Inline Files"
-
-# PROP Default_Filter "i;inl"
-<%if(grouped_inline_files)%>
-<%foreach(grouped_inline_files)%>
-# Begin Group "<%grouped_inline_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_inline_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_inline_file->file%>"
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(inline_files)%>
-# Begin Source File
-
-SOURCE="<%inline_file%>"
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%if(template_files)%>
-# Begin Group "Template Files"
-
-# PROP Default_Filter ""
-<%if(grouped_template_files)%>
-<%foreach(grouped_template_files)%>
-# Begin Group "<%grouped_template_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_template_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_template_file->file%>"
-# PROP Exclude_From_Build 1
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(template_files)%>
-# Begin Source File
-
-SOURCE="<%template_file%>"
-# PROP Exclude_From_Build 1
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%if(documentation_files)%>
-# Begin Group "Documentation"
-
-# PROP Default_Filter ""
-<%if(grouped_documentation_files)%>
-<%foreach(grouped_documentation_files)%>
-# Begin Group "<%grouped_documentation_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_documentation_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_documentation_file->file%>"
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(documentation_files)%>
-# Begin Source File
-
-SOURCE="<%documentation_file%>"
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%if(resource_files && !type_is_static)%>
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-<%if(grouped_resource_files)%>
-<%foreach(grouped_resource_files)%>
-# Begin Group "<%grouped_resource_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_resource_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_resource_file->file%>"
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(resource_files)%>
-# Begin Source File
-
-SOURCE="<%resource_file%>"
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%foreach(custom_types)%>
-<%if(custom_type->input_files)%>
-# Begin Group "<%ucw(custom_type)%>"
-
-# PROP Default_Filter "<%foreach(custom_type->inputexts)%><%custom_type->inputext%><%fornotlast(";")%><%endfor%>"
-<%foreach(custom_type->input_files)%>
-# Begin Source File
-
-SOURCE="<%custom_type->input_file%>"
-<%if(custom_type->input_file->output_files)%>
-
-<%foreach(platforms)%>
-<%foreach(configurations)%>
-!<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>"
-
-<%if(flag_overrides(custom_type->input_file, dependent))%>
-USERDEP__<%basenoextension(custom_type->input_file)%>=<%foreach(dep, flag_overrides(custom_type->input_file, dependent))%>"<%dep%><%if(!ends_with(dep, \.p.))%><%exe_ext%><%endif%>"<%fornotlast(" ")%><%endfor%><%foreach(custom_type->input_file->dependencies)%> "<%custom_type->input_file->dependencie%>"<%endfor%>
-<%else%>
-<%if(custom_type->dependent)%>
-USERDEP__<%basenoextension(custom_type->input_file)%>=<%foreach(custom_type->dependent)%>"<%custom_type->dependent%><%if(!ends_with(custom_type->dependent, \.p.))%><%exe_ext%><%endif%>"<%fornotlast(" ")%><%endfor%><%foreach(custom_type->input_file->dependencies)%> "<%custom_type->input_file->dependencie%>"<%endfor%>
-<%else%>
-<%if(custom_type->input_file->dependencies)%>
-USERDEP__<%basenoextension(custom_type->input_file)%>=<%foreach(custom_type->input_file->dependencies)%>"<%custom_type->input_file->dependencie%>"<%fornotlast(" ")%><%endfor%>
-<%endif%>
-<%endif%>
-<%endif%>
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking <%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> on $(InputPath)
-InputPath="<%custom_type->input_file%>"
-
-BuildCmds= \
-<%if(custom_type->libpath)%>
-	PATH=%PATH%;<%custom_type->libpath%> \
-<%endif%>
-<%if(flag_overrides(custom_type->input_file, gendir))%>
-	mkdir <%flag_overrides(custom_type->input_file, gendir)%> 2> nul \
-<%endif%>
-	<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath)<%if(custom_type->output_option)%> <%custom_type->output_option%><%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%><%endif%> \
-<%if(flag_overrides(custom_type->input_file, postcommand))%>
-<%foreach(custom_type->input_file)%>
-	<%flag_overrides(custom_type->input_file, postcommand)%> \
-<%endfor%>
-<%else%>
-<%if(custom_type->postcommand)%>
-<%foreach(custom_type->input_file)%>
-	<%custom_type->postcommand%> \
-<%endfor%>
-<%endif%>
-<%endif%>
-<%if(pch_header)%>
-<%if(custom_type->pch_postrule)%>
-<%foreach(custom_type->input_file->source_output_files)%>
-	echo #include "<%pch_header%>" > temporary.src \
-	type "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>" >> temporary.src \
-	move /y temporary.src "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>"
-<%endfor%>
-<%endif%>
-<%endif%>
-<%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%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-<%endfor%>
-# End Custom Build
-
-<%endfor%>
-!ENDIF
-<%endfor%>
-
-<%else%>
-# PROP Exclude_From_Build 1
-<%endif%>
-# End Source File
-<%endfor%>
-# End Group
-<%endif%>
-<%endfor%>
-# End Target
-# End Project
diff --git a/templates/make.mpd b/templates/make.mpd
index 87fc1707..13543911 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -9,9 +9,7 @@ LD            = <%ld%>
 <%else%>
 LD            = $(CXX) $(CCFLAGS) $(CPPFLAGS)
 <%endif%>
-<%if(ar)%>
-AR            = <%ar%>
-<%endif%>
+AR            = <%if(ar)%><%ar%><%else%>ar<%endif%>
 <%if(nm)%>
 NM            = <%nm%>
 <%endif%>
@@ -40,7 +38,8 @@ CCC           = $(CXX)
 MAKEFILE      = <%project_file%>
 DEPENDENCIES  = .depend.$(MAKEFILE)
 <%if(exename)%>
-BIN           = <%if(install)%><%install%><%slash%><%endif%><%targetoutdir%><%exename%>$(EXEEXT)
+BTARGETDIR    = <%if(install)%><%install%><%else%>.<%endif%><%slash%><%targetoutdir%>
+BIN           = $(BTARGETDIR)<%exename%>$(EXEEXT)
 <%endif%>
 <%foreach(configurations)%>
 <%foreach(platforms)%>
@@ -52,16 +51,18 @@ EXEEXT        = <%exe_ext%>
 LIBPREFIX     = <%lib_prefix%>
 LDLIBS        =<%foreach(libs lit_libs)%> <%libopt%><%lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%> <%ldlibs%>
 OBJS          =<%if(pch_source && pchsupport)%> <%targetoutdir%><%noextension(pch_source)%>$(OBJEXT)<%endif%><%foreach(source_files)%> <%targetoutdir%><%noextension(source_file)%>$(OBJEXT)<%endfor%><%if(rc)%><%foreach(resource_files)%> <%targetoutdir%><%resource_file%>$(OBJEXT)<%endfor%><%endif%>
+LTARGETDIR    = <%libout%><%slash%><%targetoutdir%>
 <%if(lib_ext)%>
 <%if(staticname)%>
 AREXT         = <%lib_ext%>
-LIB           = <%if(dllout)%><%dllout%><%else%><%libout%><%endif%><%slash%><%targetoutdir%>$(LIBPREFIX)<%staticname%>$(AREXT)
+LIB           = $(LTARGETDIR)$(LIBPREFIX)<%staticname%>$(AREXT)
 <%endif%>
 <%endif%>
 <%if(dll_ext)%>
 <%if(sharedname)%>
 SOEXT         = <%dll_ext%>
-SHLIB         = <%if(dllout)%><%dllout%><%else%><%libout%><%endif%><%slash%><%targetoutdir%>$(LIBPREFIX)<%sharedname%>$(SOEXT)
+SHTARGETDIR   = <%if(dllout)%><%dllout%><%else%><%libout%><%endif%><%slash%><%targetoutdir%>
+SHLIB         = $(SHTARGETDIR)$(LIBPREFIX)<%sharedname%>$(SOEXT)
 <%if(shflags)%>
 SHFLAGS       = <%shflags%>
 <%endif%>
@@ -109,17 +110,28 @@ specialscript:
 <%endif%>
 <%endfor%>
 <%endfor%>
-$(BIN): <%foreach(configurations)%><%if(tempinc)%>$(TEMPINCDIR) <%endif%><%endfor%><%targetoutdir%> $(OBJS) <%foreach(configurations)%><%foreach(platforms)%><%if(prelink)%><%targetoutdir%><%noextension(prelink)%>$(OBJEXT)<%endif%><%endfor%><%endfor%>
+$(BTARGETDIR):
+	@$(MKDIR) "$@"
+
+$(BIN): $(BTARGETDIR) <%foreach(configurations)%><%if(tempinc)%>$(TEMPINCDIR) <%endif%><%endfor%>$(OBJS) <%foreach(configurations)%><%foreach(platforms)%><%if(prelink)%><%targetoutdir%><%noextension(prelink)%>$(OBJEXT)<%endif%><%endfor%><%endfor%>
 	$(LINK.cc) $(OUTPUT_OPTION) $(OBJS) $(LDLIBS)
 
 <%endif%>
+$(LTARGETDIR):
+	@$(MKDIR) "$@"
+
 <%foreach(configurations)%>
 <%foreach(platforms)%>
 <%if(dll_ext)%>
 <%if(sharedname)%>
 all: $(SHLIB)<%if(postbuild)%> __postbuild__<%endif%>
 
-$(SHLIB): <%foreach(configurations)%><%if(tempinc)%>$(TEMPINCDIR) <%endif%><%endfor%><%targetoutdir%> $(OBJS)
+<%if(dllout)%>
+$(SHTARGETDIR):
+	@$(MKDIR) "$@"
+
+<%endif%>
+$(SHLIB): $(SHTARGETDIR) <%foreach(configurations)%><%if(tempinc)%>$(TEMPINCDIR) <%endif%><%endfor%>$(OBJS)
 	<%foreach(configurations)%><%foreach(platforms)%><%if(dld)%><%dld%> $(LDFLAGS)<%else%>$(LINK.cc)<%endif%><%endfor%><%endfor%> $(SHFLAGS) $(OUTPUT_OPTION) $(OBJS) $(LDLIBS)
 <%else%>
 <%if(staticname)%>
@@ -136,7 +148,7 @@ all: $(LIB)<%if(postbuild)%> __postbuild__<%endif%>
 <%endfor%>
 <%endfor%>
 <%if(staticname)%>
-$(LIB): <%foreach(configurations)%><%if(tempinc)%>$(TEMPINCDIR) <%endif%><%endfor%><%targetoutdir%> $(OBJS)
+$(LIB): $(LTARGETDIR) <%foreach(configurations)%><%if(tempinc)%>$(TEMPINCDIR) <%endif%><%endfor%>$(OBJS)
 <%foreach(configurations)%>
 <%foreach(platforms)%>
 	$(AR) $(ARFLAGS) $(LIB) $(OBJS)<%if(tempinc)%> `find $(TEMPINCDIR) -type f`<%endif%>
@@ -147,11 +159,6 @@ $(LIB): <%foreach(configurations)%><%if(tempinc)%>$(TEMPINCDIR) <%endif%><%endfo
 <%endfor%>
 
 <%endif%>
-<%if(targetoutdir)%>
-<%targetoutdir%>:
-	@-test -d <%targetoutdir%> || $(MKDIR) <%targetoutdir%> 2> $(NUL) || true
-
-<%endif%>
 <%if(custom_types)%>
 GENERATED_DIRTY    =<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%if(custom_type->input_file->output_files)%><%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%><%slash%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%><%endif%><%endfor%><%endfor%>
 <%foreach(custom_types)%>
diff --git a/templates/vc6dsp.mpd b/templates/vc6dsp.mpd
deleted file mode 100644
index 0207df49..00000000
--- a/templates/vc6dsp.mpd
+++ /dev/null
@@ -1,360 +0,0 @@
-# Microsoft Developer Studio Project File - Name="<%project_name%>" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "<%platform("Win32")%> (<%platform_hardware("x86")%>) <%if(exename || sharedname || staticname)%><%if(type_is_static && staticname)%>Static Library" 0x0104<%else%><%type_description%>" <%type_code%><%endif%><%else%>Generic Project" 0x010a<%endif%>
-
-CFG=<%project_name%> - <%platform("Win32")%> <%default_configuration("Debug")%>
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type.  You can then use the following command:
-!MESSAGE
-!MESSAGE NMAKE.
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE CFG="<%project_name%> - <%platform%> <%default_configuration%>"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-<%foreach(configurations)%>
-!MESSAGE "<%project_name%> - <%platform%> <%configuration%>" (based on "<%platform%> (<%platform_hardware%>) <%if(exename || sharedname || staticname)%><%if(type_is_static && staticname)%>Static Library<%else%><%type_description%><%endif%><%else%>Generic Project<%endif%>")
-<%endfor%>
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-<%foreach(configurations)%>
-!<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
-
-# PROP Use_MFC <%use_mfc("0")%>
-# PROP Use_Debug_Libraries <%use_debug_libraries("1")%>
-<%if(exename)%>
-# PROP Output_Dir "<%output_dir%>"
-<%endif%>
-<%if(type_is_static)%>
-# PROP Output_Dir "<%output_dir%>"
-<%endif%>
-<%if(type_is_dynamic)%>
-# PROP Output_Dir "<%libout%>"
-<%endif%>
-# PROP Intermediate_Dir "<%intermediate_dir%>\<%noextension(project_file)%>"
-<%if(type_is_dynamic)%>
-# PROP Ignore_Export_Lib 0
-<%endif%>
-# PROP Target_Dir ""
-<%if(type_is_static)%>
-LINK32=link.exe -lib
-<%endif%>
-# ADD CPP /nologo <%if(optimize)%><%optimize_flags("/O2")%><%else%><%debug_flags("/Ob0")%><%endif%> <%compile_flags%><%if(pdbc)%> /Fd"<%if(type_is_static)%><%libout%>\<%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb<%else%><%intermediate_dir%>\<%noextension(project_file)%>/<%endif%>"<%endif%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(unicode)%>/D UNICODE /D _UNICODE <%endif%><%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%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
-<%if(compile_flags_removed)%>
-# SUBTRACT CPP <%compile_flags_removed%>
-<%endif%>
-<%if(midl_includes)%># ADD MTL <%foreach(midl_includes)%>/I "<%midl_include%>" <%endfor%><%endif%>
-# ADD MTL <%foreach(defines)%>/D "<%define%>" <%endfor%><%if(unicode)%>/D UNICODE /D _UNICODE <%endif%><%foreach(midl_defines)%>/D "<%midl_define%>" <%endfor%><%midl_flags%>
-# ADD RSC /l 0x409<%foreach(defines macros)%> /d <%define%><%endfor%><%if(unicode)%> /d UNICODE /d _UNICODE<%endif%><%foreach(includes)%> /i "<%include%>"<%endfor%>
-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")%><%if(link_options)%> <%link_options%><%endif%> /INCREMENTAL:<%incremental("NO")%> <%foreach(reverse(libs))%><%lib%><%lib_modifier%><%lib_ext%> <%endfor%><%foreach(reverse(lit_libs))%><%lit_lib%>.lib <%endfor%><%foreach(reverse(pure_libs))%><%pure_lib%> <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo<%if(win_version)%> /version:<%win_version%><%endif%><%if(StackReserveSize)%> /stack:<%StackReserveSize%><%if(StackCommitSize)%>,<%StackCommitSize%><%endif%><%endif%> /subsystem:<%subsystem("windows")%><%if(pdbl)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%>.pdb"<%endif%><%endif%><%else%> /pdb:none<%endif%><%if(type_is_dynamic)%> /implib:"<%libout%>\<%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>" <%if(!source_files)%>/noentry <%endif%>/dll<%endif%> <%if(unicode && unicode_mfc_entry && exename && source_files)%>/entry:"<%unicode_mfc_entry%>" <%endif%><%debug_switch("/debug")%> /machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%><%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%><%endif%>"
-<%if(link_flags_removed)%>
-# SUBTRACT LINK32 <%link_flags_removed%>
-<%endif%>
-<%endif%>
-<%if(type_is_static)%>
-LIB32=link.exe -lib
-# ADD LIB32 /nologo /out:"<%libout%>\<%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>"
-<%endif%>
-<%if(postbuild)%>
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=<%eval(postbuild)%>
-# End Special Build Tool
-<%endif%>
-
-<%endfor%>
-!ENDIF
-
-# Begin Target
-
-<%foreach(configurations)%>
-# Name "<%project_name%> - <%platform%> <%configuration%>"
-<%endfor%>
-<%if(exename || sharedname || staticname)%>
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;cxx;c"
-<%if(pch_source)%>
-<%if(pch_header)%>
-# Begin Source File
-
-SOURCE="<%pch_source%>"
-# ADD CPP /Yc"<%pch_header%>"
-# End Source File
-<%endif%>
-<%endif%>
-<%if(grouped_source_files)%>
-<%foreach(grouped_source_files)%>
-# Begin Group "<%grouped_source_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_source_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_source_file->file%>"
-<%if(duplicate_index(grouped_source_file->file))%>
-<%foreach(configurations)%>
-!<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%basenoextension(grouped_source_file->file)%><%duplicate_index(grouped_source_file->file)%>.obj"
-<%endfor%>
-!ENDIF
-<%endif%>
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(source_files)%>
-# Begin Source File
-
-SOURCE="<%source_file%>"
-<%if(duplicate_index(source_file))%>
-<%foreach(configurations)%>
-!<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
-# ADD CPP /Fo"<%intermediate_dir%>\<%noextension(project_file)%>\<%basenoextension(source_file)%><%duplicate_index(source_file)%>.obj"
-<%endfor%>
-!ENDIF
-<%endif%>
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%if(header_files)%>
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hh"
-<%if(pch_header)%>
-# Begin Source File
-
-SOURCE="<%pch_header%>"
-# End Source File
-<%endif%>
-<%if(grouped_header_files)%>
-<%foreach(grouped_header_files)%>
-# Begin Group "<%grouped_header_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_header_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_header_file->file%>"
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(header_files)%>
-# Begin Source File
-
-SOURCE="<%header_file%>"
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%if(inline_files)%>
-# Begin Group "Inline Files"
-
-# PROP Default_Filter "i;inl"
-<%if(grouped_inline_files)%>
-<%foreach(grouped_inline_files)%>
-# Begin Group "<%grouped_inline_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_inline_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_inline_file->file%>"
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(inline_files)%>
-# Begin Source File
-
-SOURCE="<%inline_file%>"
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%if(template_files)%>
-# Begin Group "Template Files"
-
-# PROP Default_Filter ""
-<%if(grouped_template_files)%>
-<%foreach(grouped_template_files)%>
-# Begin Group "<%grouped_template_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_template_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_template_file->file%>"
-# PROP Exclude_From_Build 1
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(template_files)%>
-# Begin Source File
-
-SOURCE="<%template_file%>"
-# PROP Exclude_From_Build 1
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%if(documentation_files)%>
-# Begin Group "Documentation"
-
-# PROP Default_Filter ""
-<%if(grouped_documentation_files)%>
-<%foreach(grouped_documentation_files)%>
-# Begin Group "<%grouped_documentation_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_documentation_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_documentation_file->file%>"
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(documentation_files)%>
-# Begin Source File
-
-SOURCE="<%documentation_file%>"
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%if(resource_files && !type_is_static)%>
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-<%if(grouped_resource_files)%>
-<%foreach(grouped_resource_files)%>
-# Begin Group "<%grouped_resource_file%>"
-
-# PROP Default_Filter ""
-<%foreach(grouped_resource_file->files)%>
-# Begin Source File
-
-SOURCE="<%grouped_resource_file->file%>"
-# End Source File
-<%endfor%>
-# End Group
-<%endfor%>
-<%else%>
-<%foreach(resource_files)%>
-# Begin Source File
-
-SOURCE="<%resource_file%>"
-# End Source File
-<%endfor%>
-<%endif%>
-# End Group
-<%endif%>
-<%foreach(custom_types)%>
-<%if(custom_type->input_files)%>
-# Begin Group "<%ucw(custom_type)%>"
-
-# PROP Default_Filter "<%foreach(custom_type->inputexts)%><%custom_type->inputext%><%fornotlast(";")%><%endfor%>"
-<%foreach(custom_type->input_files)%>
-# Begin Source File
-
-SOURCE="<%custom_type->input_file%>"
-<%if(custom_type->input_file->output_files)%>
-
-<%foreach(configurations)%>
-!<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
-
-<%if(flag_overrides(custom_type->input_file, dependent))%>
-USERDEP__<%basenoextension(custom_type->input_file)%>=<%foreach(dep, flag_overrides(custom_type->input_file, dependent))%>"<%dep%><%if(!ends_with(dep, \.p.))%><%exe_ext%><%endif%>"<%fornotlast(" ")%><%endfor%><%foreach(custom_type->input_file->dependencies)%> "<%custom_type->input_file->dependencie%>"<%endfor%>
-<%else%>
-<%if(custom_type->dependent)%>
-USERDEP__<%basenoextension(custom_type->input_file)%>=<%foreach(custom_type->dependent)%>"<%custom_type->dependent%><%if(!ends_with(custom_type->dependent, \.p.))%><%exe_ext%><%endif%>"<%fornotlast(" ")%><%endfor%><%foreach(custom_type->input_file->dependencies)%> "<%custom_type->input_file->dependencie%>"<%endfor%>
-<%else%>
-<%if(custom_type->input_file->dependencies)%>
-USERDEP__<%basenoextension(custom_type->input_file)%>=<%foreach(custom_type->input_file->dependencies)%>"<%custom_type->input_file->dependencie%>"<%fornotlast(" ")%><%endfor%>
-<%endif%>
-<%endif%>
-<%endif%>
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking <%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> on $(InputPath)
-InputPath="<%custom_type->input_file%>"
-
-BuildCmds= \
-<%if(custom_type->libpath)%>
-	PATH=%PATH%;<%custom_type->libpath%> \
-<%endif%>
-<%if(flag_overrides(custom_type->input_file, gendir))%>
-	mkdir <%flag_overrides(custom_type->input_file, gendir)%> 2> nul \
-<%endif%>
-	<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath)<%if(custom_type->output_option)%> <%custom_type->output_option%><%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%><%endif%> \
-<%if(flag_overrides(custom_type->input_file, postcommand))%>
-<%foreach(custom_type->input_file)%>
-	<%flag_overrides(custom_type->input_file, postcommand)%> \
-<%endfor%>
-<%else%>
-<%if(custom_type->postcommand)%>
-<%foreach(custom_type->input_file)%>
-	<%custom_type->postcommand%> \
-<%endfor%>
-<%endif%>
-<%endif%>
-<%if(pch_header)%>
-<%if(custom_type->pch_postrule)%>
-<%foreach(custom_type->input_file->source_output_files)%>
-	echo #include "<%pch_header%>" > temporary.src \
-	type "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>" >> temporary.src \
-	move /y temporary.src "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>"
-<%endfor%>
-<%endif%>
-<%endif%>
-<%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%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-<%endfor%>
-# End Custom Build
-
-<%endfor%>
-!ENDIF
-
-<%else%>
-# PROP Exclude_From_Build 1
-<%endif%>
-# End Source File
-<%endfor%>
-# End Group
-<%endif%>
-<%endfor%>
-# End Target
-# End Project