ChangeLogTag: Wed Mar 12 13:31:08 2003 Chad Elliott <elliott_c@ociweb.com>

7 files changed, 27 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 021f0d8d040..4fdb135f6b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Mar 12 13:31:08 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/templates/em3vcp.mpd:
+        * bin/MakeProjectCreator/templates/em3vcpdll.mpt:
+        * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt:
+        * bin/MakeProjectCreator/templates/em3vcplibexe.mpt:
+        * bin/MakeProjectCreator/templates/nmakedll.mpt:
+        * bin/MakeProjectCreator/templates/nmakeexe.mpt:
+
+          Fixed output directories for executables and pdb locations as
+          below.
+
 Wed Mar 12 12:19:23 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/templates/vc6dsp.mpd:
@@ -14,11 +26,11 @@ Wed Mar 12 12:19:23 2003  Chad Elliott  <elliott_c@ociweb.com>
 
 Wed Mar 12 08:59:18 2003  Ossama Othman  <ossama@uci.edu>
 
-	* ace/Log_Msg.cpp (log_hexdump):
-	* tests/Proactor_Test.cpp:
+        * ace/Log_Msg.cpp (log_hexdump):
+        * tests/Proactor_Test.cpp:
 
-	  Another round of format specifier corrections.  "%lu" instead of
-	  "%u".  Addresses warnings in 64 bit platform builds.
+          Another round of format specifier corrections.  "%lu" instead of
+          "%u".  Addresses warnings in 64 bit platform builds.
 
 Wed Mar 12 10:42:40 2003  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/bin/MakeProjectCreator/templates/em3vcp.mpd b/bin/MakeProjectCreator/templates/em3vcp.mpd
index 0069e43a9af..c096735d038 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)%>/o"<%libout%>\<%sharedname%>.bsc"<%endif%>
 <%if(type_is_binary)%>
 LINK32=link.exe
-# ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%> <%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%><%endif%>/INCREMENTAL:<%incremental("NO")%> <%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" /stack:<%stack("0x10000,0x1000")%> /entry:"_DllMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /version:<%version("1.0")%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>" <%if(type_is_dynamic)%> /dll<%endif%> <%if(use_debug_libraries)%>/debug<%endif%> <%if(pdb)%><%if(sharedname)%>/pdb:<%sharedname%><%lib_modifier%>.pdb <%endif%><%endif%>/machine:<%machine%> /out:"<%if(sharedname)%><%dllout%>\<%machine%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%>\<%endif%><%machine%>\<%exename%>.exe<%endif%>"
+# ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%> <%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%><%endif%>/INCREMENTAL:<%incremental("NO")%> <%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" /stack:<%stack("0x10000,0x1000")%> /entry:"_DllMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /version:<%version("1.0")%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdb)%><%if(sharedname)%> /pdb:"<%dllout%>\<%machine%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%>\<%endif%><%output_dir%>\<%machine%>\<%exename%>.pdb"<%endif%><%endif%><%endif%> <%if(type_is_dynamic)%> /dll<%endif%> <%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%dllout%>\<%machine%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%>\<%endif%><%output_dir%>\<%machine%>\<%exename%>.exe<%endif%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/bin/MakeProjectCreator/templates/em3vcpdll.mpt b/bin/MakeProjectCreator/templates/em3vcpdll.mpt
index f73c4b2940b..5b1d4bf6656 100644
--- a/bin/MakeProjectCreator/templates/em3vcpdll.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcpdll.mpt
@@ -7,6 +7,7 @@ type_is_dynamic       = 1
 common_defines        = UNICODE _UNICODE
 pch_defines           = ACE_USING_PCH
 ssl_libs              = libeay32 ssleay32
+pdb                   = 1
 
 WCE x86 {
   type_code   = 0x8302
@@ -47,8 +48,8 @@ Debug {
   compile_flags         = /W3 /Zi /Od
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
+  output_dir            = .
   intermediate_dir      = Debug
   lib_modifier          = d
-  pdb                   = 1
 }
 
diff --git a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
index 34a465fa40b..c274756dd35 100644
--- a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
@@ -7,6 +7,7 @@ type_is_binary        = 1
 common_defines        = UNICODE _UNICODE
 pch_defines           = ACE_USING_PCH
 ssl_libs              = libeay32 ssleay32
+pdb                   = 1
 
 WCE x86 {
   type_code   = 0x8301
@@ -47,7 +48,7 @@ Debug {
   compile_flags         = /W3 /Zi /Od
   defines               = _DEBUG
   compile_flags_removed = /YX
+  output_dir            = .
   intermediate_dir      = Debug
   lib_modifier          = d
 }
-
diff --git a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
index 65febff00b7..49ade6d2270 100644
--- a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
@@ -7,6 +7,8 @@ type_is_binary        = 1
 common_defines        = UNICODE _UNICODE
 pch_defines           = ACE_USING_PCH
 ssl_libs              = libeay32 ssleay32
+need_libflags         = 1
+pdb                   = 1
 
 WCE x86 {
   type_code   = 0x8301
@@ -39,7 +41,6 @@ Static Release {
   defines               = NDEBUG
   compile_flags_removed = /YX
   lib_modifier          = s
-  need_libflags         = 1
   output_dir            = Static_Release
   intermediate_dir      = Static_Release
 }
@@ -50,7 +51,6 @@ Static Debug {
   defines               = _DEBUG
   compile_flags_removed = /YX
   lib_modifier          = sd
-  need_libflags         = 1
   output_dir            = Static_Debug
   intermediate_dir      = Static_Debug
 }
diff --git a/bin/MakeProjectCreator/templates/nmakedll.mpt b/bin/MakeProjectCreator/templates/nmakedll.mpt
index 27af39ff54a..385aaa1a08a 100644
--- a/bin/MakeProjectCreator/templates/nmakedll.mpt
+++ b/bin/MakeProjectCreator/templates/nmakedll.mpt
@@ -27,6 +27,7 @@ Release {
   debug_switch          =
   type_is_dynamic       = 1
   type_is_binary        = 1
+  pdb                   = 1
   ssl_libs              = libeay32 ssleay32
 }
 
@@ -36,6 +37,7 @@ Debug {
   compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
+  output_dir            = .
   intermediate_dir      = Debug
   lib_modifier          = d
   type_is_dynamic       = 1
@@ -71,6 +73,5 @@ Static Debug {
   lib_modifier          = sd
   type_is_static        = 1
   need_libflags         = 1
-  pdb                   = 1
 }
 
diff --git a/bin/MakeProjectCreator/templates/nmakeexe.mpt b/bin/MakeProjectCreator/templates/nmakeexe.mpt
index c2e60f11fdb..8ba79064afe 100644
--- a/bin/MakeProjectCreator/templates/nmakeexe.mpt
+++ b/bin/MakeProjectCreator/templates/nmakeexe.mpt
@@ -7,6 +7,7 @@ type_is_binary        = 1
 common_defines        = WIN32 _CONSOLE
 subsystem             = console
 pch_defines           = ACE_USING_PCH
+pdb                   = 1
 
 Win32 {
   machine_description = x86
@@ -36,9 +37,9 @@ Debug {
   compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /YX
+  output_dir            = .
   intermediate_dir      = Debug
   lib_modifier          = d
-  pdb                   = 1
   ssl_libs              = libeay32 ssleay32
 }
 
@@ -63,5 +64,4 @@ Static Debug {
   need_libflags         = 1
   output_dir            = Static_Debug
   intermediate_dir      = Static_Debug
-  pdb                   = 1
 }