ChangeLogTag: Mon Sep 26 07:10:17 2005 Chad Elliott <elliott_c@ociweb.com>

6 files changed, 46 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 67c291fa..fff4a905 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,27 @@
+Mon Sep 26 07:10:17 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * README:
+        * modules/ProjectCreator.pm:
+
+          Added generic_pre_extension and generic_pre_filename custom build
+          settings.
+
+        * templates/vc7.mpd:
+        * templates/vc8.mpd:
+
+          Added support for the builtin Visual Studio MIDL.
+
+        * templates/vccommon.mpt:
+
+          Added a comment that this file is not common to Visual C++, just
+          vc6.
+
 Thu Sep 22 12:43:43 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* templates/automake.mpd:
+        * templates/automake.mpd:
 
           Changed to output libs, lit_libs, and pure_libs on separate
-	  lines.
+          lines.
 
 Tue Sep 20 08:47:21 2005  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/README b/README
index e417d8a8..4c3d37a3 100644
--- a/README
+++ b/README
@@ -423,20 +423,24 @@ resource_pre_extension      This is the same as pre_extension except that it
                             only applies to resource_outputext.
 documentation_pre_extension This is the same as pre_extension except that it
                             only applies to documentation_outputext.
+generic_pre_extension       This is the same as pre_extension except that it
+                            only applies to generic_outputext.
 pre_filename        This is similar to pre_extension except that the values
                     are prepended to the file name instead of the extension.
 source_pre_filename         This is the same as pre_filename except that it
-                            only applies to source_outputext.
+                            only applies to source files.
 inline_pre_filename         This is the same as pre_filename except that it
-                            only applies to inline_outputext.
+                            only applies to inline files.
 header_pre_filename         This is the same as pre_filename except that it
-                            only applies to header_outputext.
+                            only applies to header files.
 template_pre_filename       This is the same as pre_filename except that it
-                            only applies to template_outputext.
+                            only applies to template files.
 resource_pre_filename       This is the same as pre_filename except that it
-                            only applies to resource_outputext.
+                            only applies to resource files.
 documentation_pre_filename  This is the same as pre_filename except that it
-                            only applies to documentation_outputext.
+                            only applies to documentation files.
+generic_pre_filename        This is the same as pre_filename except that it
+                            only applies to generic files.
 source_outputext    This is a comma separated list of possible source file
                     output extensions.  If the command does not produce
                     source files, then this can be omitted.
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 4dfbde8a..fa80b57e 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -88,6 +88,7 @@ my(%customDefined) = ('automatic'                   => 0x04,
                       'inline_pre_extension'        => 0x08,
                       'documentation_pre_extension' => 0x08,
                       'resource_pre_extension'      => 0x08,
+                      'generic_pre_extension'       => 0x08,
                       'pre_filename'                => 0x08,
                       'source_pre_filename'         => 0x08,
                       'template_pre_filename'       => 0x08,
@@ -95,6 +96,7 @@ my(%customDefined) = ('automatic'                   => 0x04,
                       'inline_pre_filename'         => 0x08,
                       'documentation_pre_filename'  => 0x08,
                       'resource_pre_filename'       => 0x08,
+                      'generic_pre_filename'        => 0x08,
                       'source_outputext'            => 0x0a,
                       'template_outputext'          => 0x0a,
                       'header_outputext'            => 0x0a,
diff --git a/templates/vc7.mpd b/templates/vc7.mpd
index 3696b810..546d9855 100644
--- a/templates/vc7.mpd
+++ b/templates/vc7.mpd
@@ -137,6 +137,13 @@
 				TargetMachine="<%machine("1")%>"/>
 <%endif%>
 			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions="<%foreach(midl_defines)%>/D <%midl_define%> <%endfor%><%midl_flags%>"
+				AdditionalIncludeDirectories="<%foreach(midl_includes)%><%midl_include%><%fornotlast(",")%><%endfor%>"
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 <%if(postbuild)%>
 				CommandLine="<%eval(postbuild)%>"
diff --git a/templates/vc8.mpd b/templates/vc8.mpd
index fd17977d..e95c7859 100644
--- a/templates/vc8.mpd
+++ b/templates/vc8.mpd
@@ -50,6 +50,10 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				AdditionalOptions="<%foreach(midl_defines)%>/D <%midl_define%> <%endfor%><%midl_flags%>"
+				AdditionalIncludeDirectories="<%foreach(midl_includes)%><%midl_include%><%fornotlast(",")%><%endfor%>"
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
diff --git a/templates/vccommon.mpt b/templates/vccommon.mpt
index d7642365..6a1deccc 100644
--- a/templates/vccommon.mpt
+++ b/templates/vccommon.mpt
@@ -1,6 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
+// NOTE: This is really only common to vc6 and should remain that way.  The
+//       file is poorly named.  -- Chad Elliott 9/23/2005
+
 midl_defines =
 midl_flags = /nologo /mktyplib203 /win32
 midl_includes =