ChangeLogTag: Tue Jul 29 09:39:58 2003 Chad Elliott <elliott_c@ociweb.com>

24 files changed, 58 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6cb1f09032e..06fc11bab87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+Tue Jul 29 09:39:58 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/config/vcpartialmacros.mpt:
+
+          Modified to add to pch_defines instead of assigning.
+
+        * bin/MakeProjectCreator/templates/bordll.mpt:
+        * bin/MakeProjectCreator/templates/borexe.mpt:
+        * bin/MakeProjectCreator/templates/common.mpt:
+        * bin/MakeProjectCreator/templates/em3vcpdll.mpt:
+        * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt:
+        * bin/MakeProjectCreator/templates/em3vcplib.mpt:
+        * bin/MakeProjectCreator/templates/em3vcplibexe.mpt:
+        * bin/MakeProjectCreator/templates/gnudll.mpt:
+        * bin/MakeProjectCreator/templates/gnuexe.mpt:
+        * bin/MakeProjectCreator/templates/makedll.mpt:
+        * bin/MakeProjectCreator/templates/nmakedll.mpt:
+        * bin/MakeProjectCreator/templates/nmakeexe.mpt:
+        * bin/MakeProjectCreator/templates/va4iccdll.mpt:
+        * bin/MakeProjectCreator/templates/va4iccdllexe.mpt:
+        * bin/MakeProjectCreator/templates/va4icclib.mpt:
+        * bin/MakeProjectCreator/templates/va4icclibexe.mpt:
+        * bin/MakeProjectCreator/templates/vc6dspdll.mpt:
+        * bin/MakeProjectCreator/templates/vc6dspdllexe.mpt:
+        * bin/MakeProjectCreator/templates/vc6dsplib.mpt:
+        * bin/MakeProjectCreator/templates/vc6dsplibexe.mpt:
+        * bin/MakeProjectCreator/templates/vc7dll.mpt:
+        * bin/MakeProjectCreator/templates/vc7exe.mpt:
+
+          Added the common.mpt for a place to put common template input
+          settings and added an include of common to each template input
+          file.
+
 Tue Jul 29 09:01:44 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * Kokyu/tests/DSRT_MIF/DSRT_MIF.mpc:
diff --git a/bin/MakeProjectCreator/config/vcpartialmacros.mpt b/bin/MakeProjectCreator/config/vcpartialmacros.mpt
index b553205a957..eab4d46d053 100644
--- a/bin/MakeProjectCreator/config/vcpartialmacros.mpt
+++ b/bin/MakeProjectCreator/config/vcpartialmacros.mpt
@@ -1,6 +1,6 @@
 // ACE specific macros for nmake, vc6, vc7 and em3
 
-pch_defines = ACE_USING_PCH
+pch_defines += ACE_USING_PCH
 
 MFC Release {
   defines += ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
diff --git a/bin/MakeProjectCreator/templates/bordll.mpt b/bin/MakeProjectCreator/templates/bordll.mpt
index 13d0b8c73a2..d1f2dc6255a 100644
--- a/bin/MakeProjectCreator/templates/bordll.mpt
+++ b/bin/MakeProjectCreator/templates/bordll.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 type_is_binary  = 1
 type_is_dynamic = 1
diff --git a/bin/MakeProjectCreator/templates/borexe.mpt b/bin/MakeProjectCreator/templates/borexe.mpt
index c06ca34167e..ffc6dd650a2 100644
--- a/bin/MakeProjectCreator/templates/borexe.mpt
+++ b/bin/MakeProjectCreator/templates/borexe.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 type_is_binary  = 1
 common_defines  = WIN32
diff --git a/bin/MakeProjectCreator/templates/common.mpt b/bin/MakeProjectCreator/templates/common.mpt
new file mode 100644
index 00000000000..1568435dd3f
--- /dev/null
+++ b/bin/MakeProjectCreator/templates/common.mpt
@@ -0,0 +1,3 @@
+// This file contains assignments that are common to all templates
+
+pch_defines += USING_PCH
diff --git a/bin/MakeProjectCreator/templates/em3vcpdll.mpt b/bin/MakeProjectCreator/templates/em3vcpdll.mpt
index 8d2ec0a482b..9b9d0a931f8 100644
--- a/bin/MakeProjectCreator/templates/em3vcpdll.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcpdll.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 configurations        = Release Debug
 platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
diff --git a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
index f8aabd11f58..c8c6610955c 100644
--- a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 type_description      = "Application"
 platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
diff --git a/bin/MakeProjectCreator/templates/em3vcplib.mpt b/bin/MakeProjectCreator/templates/em3vcplib.mpt
index dbbf795db18..43d63578b59 100644
--- a/bin/MakeProjectCreator/templates/em3vcplib.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcplib.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 type_description      = "Static Library"
 platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
diff --git a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
index 71afc5e2a5c..e297cd11cea 100644
--- a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 type_description      = "Application"
 platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
diff --git a/bin/MakeProjectCreator/templates/gnudll.mpt b/bin/MakeProjectCreator/templates/gnudll.mpt
index 02a06951a3b..38547bbac4d 100644
--- a/bin/MakeProjectCreator/templates/gnudll.mpt
+++ b/bin/MakeProjectCreator/templates/gnudll.mpt
@@ -1 +1,2 @@
 conditional_include "idl_compiler"
+conditional_include "common"
diff --git a/bin/MakeProjectCreator/templates/gnuexe.mpt b/bin/MakeProjectCreator/templates/gnuexe.mpt
index 02a06951a3b..38547bbac4d 100644
--- a/bin/MakeProjectCreator/templates/gnuexe.mpt
+++ b/bin/MakeProjectCreator/templates/gnuexe.mpt
@@ -1 +1,2 @@
 conditional_include "idl_compiler"
+conditional_include "common"
diff --git a/bin/MakeProjectCreator/templates/makedll.mpt b/bin/MakeProjectCreator/templates/makedll.mpt
index 785ff9df64a..ac26092eb9a 100644
--- a/bin/MakeProjectCreator/templates/makedll.mpt
+++ b/bin/MakeProjectCreator/templates/makedll.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler"
+conditional_include "common"
 
 configurations = gcc
 soext          = so
diff --git a/bin/MakeProjectCreator/templates/nmakedll.mpt b/bin/MakeProjectCreator/templates/nmakedll.mpt
index 619dfa5ec26..57b2e3cf94e 100644
--- a/bin/MakeProjectCreator/templates/nmakedll.mpt
+++ b/bin/MakeProjectCreator/templates/nmakedll.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 configurations        = Release Debug "Static Release" "Static Debug"
 platforms             = Win32
diff --git a/bin/MakeProjectCreator/templates/nmakeexe.mpt b/bin/MakeProjectCreator/templates/nmakeexe.mpt
index 1ac7ec259f9..24df5c8e167 100644
--- a/bin/MakeProjectCreator/templates/nmakeexe.mpt
+++ b/bin/MakeProjectCreator/templates/nmakeexe.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 type_description      = "Console Application"
 type_code             = 0x0103
diff --git a/bin/MakeProjectCreator/templates/va4iccdll.mpt b/bin/MakeProjectCreator/templates/va4iccdll.mpt
index e41f88a7d17..29c76ef0cbf 100644
--- a/bin/MakeProjectCreator/templates/va4iccdll.mpt
+++ b/bin/MakeProjectCreator/templates/va4iccdll.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 common_defines  = _WINDOWS WIN32
 type_is_dynamic = 1
diff --git a/bin/MakeProjectCreator/templates/va4iccdllexe.mpt b/bin/MakeProjectCreator/templates/va4iccdllexe.mpt
index ef7acae0801..41147727391 100644
--- a/bin/MakeProjectCreator/templates/va4iccdllexe.mpt
+++ b/bin/MakeProjectCreator/templates/va4iccdllexe.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 common_defines = _WINDOWS _CONSOLE
 type_is_binary = 1
diff --git a/bin/MakeProjectCreator/templates/va4icclib.mpt b/bin/MakeProjectCreator/templates/va4icclib.mpt
index d484f7b4e7d..e79e55d6481 100644
--- a/bin/MakeProjectCreator/templates/va4icclib.mpt
+++ b/bin/MakeProjectCreator/templates/va4icclib.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 common_defines = _WINDOWS WIN32
 type_is_static = 1
diff --git a/bin/MakeProjectCreator/templates/va4icclibexe.mpt b/bin/MakeProjectCreator/templates/va4icclibexe.mpt
index b9ee757d5e4..e32938b787e 100644
--- a/bin/MakeProjectCreator/templates/va4icclibexe.mpt
+++ b/bin/MakeProjectCreator/templates/va4icclibexe.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 common_defines   = _WINDOWS _CONSOLE
 type_is_binary   = 1
diff --git a/bin/MakeProjectCreator/templates/vc6dspdll.mpt b/bin/MakeProjectCreator/templates/vc6dspdll.mpt
index 50a8045c575..e432257a5c8 100644
--- a/bin/MakeProjectCreator/templates/vc6dspdll.mpt
+++ b/bin/MakeProjectCreator/templates/vc6dspdll.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 configurations  = Release Debug
 type_is_binary  = 1
diff --git a/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt b/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt
index 44d8f2c83eb..c90e398b98c 100644
--- a/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt
+++ b/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 type_description = "Console Application"
 type_code        = 0x0103
diff --git a/bin/MakeProjectCreator/templates/vc6dsplib.mpt b/bin/MakeProjectCreator/templates/vc6dsplib.mpt
index a276a7e46bc..0dd5f276fb0 100644
--- a/bin/MakeProjectCreator/templates/vc6dsplib.mpt
+++ b/bin/MakeProjectCreator/templates/vc6dsplib.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 type_description      = "Static Library"
 type_code             = 0x0104
diff --git a/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt b/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt
index 2618128db7f..6d48eb098a8 100644
--- a/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt
+++ b/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 type_description      = "Console Application"
 type_code             = 0x0103
diff --git a/bin/MakeProjectCreator/templates/vc7dll.mpt b/bin/MakeProjectCreator/templates/vc7dll.mpt
index 69560940033..a92db5337fd 100644
--- a/bin/MakeProjectCreator/templates/vc7dll.mpt
+++ b/bin/MakeProjectCreator/templates/vc7dll.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 configurations     = Release Debug "Static Release" "Static Debug"
 common_defines     = WIN32 _WINDOWS
diff --git a/bin/MakeProjectCreator/templates/vc7exe.mpt b/bin/MakeProjectCreator/templates/vc7exe.mpt
index 03e3d00b0df..4f4d294c5f4 100644
--- a/bin/MakeProjectCreator/templates/vc7exe.mpt
+++ b/bin/MakeProjectCreator/templates/vc7exe.mpt
@@ -1,4 +1,5 @@
 conditional_include "idl_compiler_win32"
+conditional_include "common"
 
 configurations     = Release Debug "Static Release" "Static Debug"
 type_is_binary     = 1