ChangeLogTag: Tue Jan 3 08:26:34 2006 Chad Elliott <elliott_c@ociweb.com>

15 files changed, 61 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index aaa08a73..810b06dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+Tue Jan  3 08:26:34 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * USAGE:
+        * modules/Options.pm:
+
+          Added the possible language settings to the help message.
+
+        * templates/make.mpd:
+        * templates/makedll.mpt:
+
+          Allow control of the 'genflags' setting with the 'optimize'
+          template variable.  This changes the default 'genflags' setting
+          from -g to -O.
+
+        * templates/vc7.mpd:
+        * templates/vc7dll.mpt:
+        * templates/vc7exe.mpt:
+        * templates/vc7lib.mpt:
+        * templates/vc7libexe.mpt:
+        * templates/vc8.mpd:
+        * templates/vc8dll.mpt:
+        * templates/vc8exe.mpt:
+        * templates/vc8lib.mpt:
+        * templates/vc8libexe.mpt:
+
+          Introduced a new template variable, 'debug_prj', which helps
+          control which run-time library is used during linking.
+          Previously, this was controled by the 'optimize' template
+          variable, but building a "Release" configuration with 'optimize'
+          turned off did not work where inline functions were used in other
+          libraries (being linked in) where 'optimize' was left on.
+
 Mon Dec 26 21:02:36 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * templates/vc7.mpd:
diff --git a/USAGE b/USAGE
index e7c8cd3a..c31ca687 100644
--- a/USAGE
+++ b/USAGE
@@ -46,7 +46,8 @@ Usage: mwc.pl [-global <file>] [-include <directory>] [-recurse]
                        option can be used multiple times to add directories.
        -into           Place all output files in a mirrored directory
                        structure starting at <directory>.
-       -language       Specify the language preference.  The default is
+       -language       Specify the language preference; possible values are
+                       [cplusplus csharp java vb].  The default is
                        cplusplus.
        -make_coexistence If multiple 'make' based project types are
                        generated, they will be named such that they can coexist.
diff --git a/modules/Options.pm b/modules/Options.pm
index b70f5de8..d7c8bd14 100644
--- a/modules/Options.pm
+++ b/modules/Options.pm
@@ -18,6 +18,7 @@ use DirectoryManager;
 # Data Section
 # ************************************************************
 
+my($deflang)   = 'cplusplus';
 my(%languages) = ('cplusplus' => 1,
                   'csharp'    => 1,
                   'java'      => 1,
@@ -101,8 +102,9 @@ sub printUsage {
 "                       option can be used multiple times to add directories.\n" .
 "       -into           Place all output files in a mirrored directory\n" .
 "                       structure starting at <directory>.\n" .
-"       -language       Specify the language preference.  The default is\n".
-"                       cplusplus.\n" .
+"       -language       Specify the language preference; possible values are\n",
+"                       [", join(' ', sort keys %languages), "].  The default is\n".
+"                       $deflang.\n",
 "       -make_coexistence If multiple 'make' based project types are\n" .
 "                       generated, they will be named such that they can coexist.\n" .
 "       -name_modifier  Modify output names.  The pattern passed to this\n" .
@@ -206,7 +208,7 @@ sub options {
   my($nmodifier)  = undef;
   my($into)       = undef;
   my($hierarchy)  = 0;
-  my($language)   = ($defaults ? 'cplusplus' : undef);
+  my($language)   = ($defaults ? $deflang : undef);
   my($dynamic)    = ($defaults ? 1 : undef);
   my($reldefs)    = ($defaults ? 1 : undef);
   my($toplevel)   = ($defaults ? 1 : undef);
diff --git a/templates/make.mpd b/templates/make.mpd
index 35da7055..c5e05fdc 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -77,7 +77,7 @@ SHFLAGS       = <%shflags%>
 <%endif%>
 <%endfor%>
 <%endfor%>
-GENFLAGS      = <%genflags(-g)%>
+GENFLAGS      = <%if(optimize)%><%genflags(-O)%><%else%><%genflags(-g)%><%endif%>
 SRC           =<%if(pch_source && pchsupport)%> <%pch_source%><%endif%> <%source_files%>
 LINK.cc       = $(LD) $(LDFLAGS)
 <%if(dynamicflags)%>
diff --git a/templates/makedll.mpt b/templates/makedll.mpt
index c761ad68..4f512fa6 100644
--- a/templates/makedll.mpt
+++ b/templates/makedll.mpt
@@ -29,6 +29,7 @@ targetoutdir     =
 slash            = /
 libopt           = -l
 build64bit       = 1
+optimize         = 1
 pchext           = .gch
 
 // ***********************************************************************
diff --git a/templates/vc7.mpd b/templates/vc7.mpd
index 970b9dd3..221ec424 100644
--- a/templates/vc7.mpd
+++ b/templates/vc7.mpd
@@ -52,7 +52,7 @@
 <%if(runtime_library)%>
 				RuntimeLibrary="<%runtime_library%>"
 <%else%>
-				RuntimeLibrary="<%if(type_is_static || need_staticflags)%><%if(!optimize)%>1<%else%>0<%endif%><%else%><%if(!optimize)%>3<%else%>2<%endif%><%endif%>"
+				RuntimeLibrary="<%if(type_is_static || need_staticflags)%><%if(debug_prj)%>1<%else%>0<%endif%><%else%><%if(debug_prj)%>3<%else%>2<%endif%><%endif%>"
 <%endif%>
 				BufferSecurityCheck="<%BufferSecurityCheck("TRUE")%>"
 				EnableFunctionLevelLinking="<%EnableFunctionLevelLinking("TRUE")%>"
diff --git a/templates/vc7dll.mpt b/templates/vc7dll.mpt
index f9e5f5ad..3ba3be15 100644
--- a/templates/vc7dll.mpt
+++ b/templates/vc7dll.mpt
@@ -18,6 +18,7 @@ Release {
 
 Debug {
   optimize         =
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = .
   intermediate_dir = Debug
@@ -38,6 +39,7 @@ MFC Release {
 
 MFC Debug {
   optimize         =
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = MFC_Debug
   intermediate_dir = MFC_Debug
diff --git a/templates/vc7exe.mpt b/templates/vc7exe.mpt
index bb653f22..e857b16d 100644
--- a/templates/vc7exe.mpt
+++ b/templates/vc7exe.mpt
@@ -20,6 +20,7 @@ Release {
 
 Debug {
   optimize         =
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = .
   intermediate_dir = Debug
@@ -29,7 +30,7 @@ Debug {
 }
 
 MFC Release {
-  LinkIncremental  = 1
+  LinkIncremental   = 1
   optimize          = 3
   common_defines    = WIN32 _WINDOWS
   defines           = NDEBUG _AFXDLL
@@ -42,6 +43,7 @@ MFC Release {
 
 MFC Debug {
   optimize          =
+  debug_prj         = 1
   common_defines    = WIN32 _WINDOWS
   defines           = _DEBUG _AFXDLL
   output_dir        = MFC_Debug
diff --git a/templates/vc7lib.mpt b/templates/vc7lib.mpt
index c8028acb..366289d9 100644
--- a/templates/vc7lib.mpt
+++ b/templates/vc7lib.mpt
@@ -19,6 +19,7 @@ Release {
 
 Debug {
   optimize         =
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = Static_Debug
   intermediate_dir = Static_Debug
@@ -37,6 +38,7 @@ MFC Release {
 
 MFC Debug {
   optimize         =
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = Static_MFC_Debug
   intermediate_dir = Static_MFC_Debug
diff --git a/templates/vc7libexe.mpt b/templates/vc7libexe.mpt
index fbc81623..732a1fc8 100644
--- a/templates/vc7libexe.mpt
+++ b/templates/vc7libexe.mpt
@@ -21,6 +21,7 @@ Release {
 
 Debug {
   optimize         =
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = Static_Debug
   intermediate_dir = Static_Debug
@@ -30,7 +31,7 @@ Debug {
 }
 
 MFC Release {
-  LinkIncremental  = 1
+  LinkIncremental   = 1
   optimize          = 3
   defines           = NDEBUG _AFXDLL
   output_dir        = Static_MFC_Release
@@ -42,6 +43,7 @@ MFC Release {
 
 MFC Debug {
   optimize          =
+  debug_prj         = 1
   defines           = _DEBUG _AFXDLL
   output_dir        = Static_MFC_Debug
   intermediate_dir  = Static_MFC_Debug
diff --git a/templates/vc8.mpd b/templates/vc8.mpd
index bf3f0ea0..8c96ff3c 100644
--- a/templates/vc8.mpd
+++ b/templates/vc8.mpd
@@ -118,7 +118,7 @@
 <%if(runtime_library)%>
 				RuntimeLibrary="<%runtime_library%>"
 <%else%>
-				RuntimeLibrary="<%if(type_is_static || need_staticflags)%><%if(!optimize)%>1<%else%>0<%endif%><%else%><%if(!optimize)%>3<%else%>2<%endif%><%endif%>"
+				RuntimeLibrary="<%if(type_is_static || need_staticflags)%><%if(debug_prj)%>1<%else%>0<%endif%><%else%><%if(debug_prj)%>3<%else%>2<%endif%><%endif%>"
 <%endif%>
 <%if(StructMemberAlignment)%>
 				StructMemberAlignment="<%StructMemberAlignment%>"
diff --git a/templates/vc8dll.mpt b/templates/vc8dll.mpt
index d8c1aeb5..c619039c 100644
--- a/templates/vc8dll.mpt
+++ b/templates/vc8dll.mpt
@@ -22,6 +22,7 @@ Release {
 }
 
 Debug {
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = .
   intermediate_dir = Debug
@@ -39,6 +40,7 @@ MFC Release {
 }
 
 MFC Debug {
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = MFC_Debug
   intermediate_dir = MFC_Debug
diff --git a/templates/vc8exe.mpt b/templates/vc8exe.mpt
index 7fdf7c34..c2814d9f 100644
--- a/templates/vc8exe.mpt
+++ b/templates/vc8exe.mpt
@@ -22,6 +22,7 @@ Release {
 }
 
 Debug {
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = .
   intermediate_dir = Debug
@@ -41,6 +42,7 @@ MFC Release {
 }
 
 MFC Debug {
+  debug_prj         = 1
   common_defines    = WIN32 _WINDOWS
   defines           = _DEBUG _AFXDLL
   output_dir        = MFC_Debug
diff --git a/templates/vc8lib.mpt b/templates/vc8lib.mpt
index 252f2814..d762b519 100644
--- a/templates/vc8lib.mpt
+++ b/templates/vc8lib.mpt
@@ -22,6 +22,7 @@ Release {
 }
 
 Debug {
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = Static_Debug
   intermediate_dir = Static_Debug
@@ -38,6 +39,7 @@ MFC Release {
 }
 
 MFC Debug {
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = Static_MFC_Debug
   intermediate_dir = Static_MFC_Debug
diff --git a/templates/vc8libexe.mpt b/templates/vc8libexe.mpt
index 371776b7..5789e48d 100644
--- a/templates/vc8libexe.mpt
+++ b/templates/vc8libexe.mpt
@@ -23,6 +23,7 @@ Release {
 }
 
 Debug {
+  debug_prj        = 1
   defines          = _DEBUG
   output_dir       = Static_Debug
   intermediate_dir = Static_Debug
@@ -41,6 +42,7 @@ MFC Release {
 }
 
 MFC Debug {
+  debug_prj         = 1
   defines           = _DEBUG _AFXDLL
   output_dir        = Static_MFC_Debug
   intermediate_dir  = Static_MFC_Debug