ChangeLogTag: Thu Apr 17 07:05:50 2003 Chad Elliott <elliott_c@ociweb.com>

7 files changed, 8 insertions, 3 deletions

diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 1d083c4f..65128e84 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -768,7 +768,8 @@ sub generate_default_target_names {
 sub generate_default_pch_filenames {
   my($self)  = shift;
   my($files) = shift;
-  my($pname) = $self->get_assignment('project_name');
+  my($pname) = $self->escape_regex_special(
+                       $self->get_assignment('project_name'));
 
   if (!defined $self->get_assignment('pch_header')) {
     my($count)    = 0;
diff --git a/templates/em3.mpd b/templates/em3.mpd
index ee763f65..3dfd2349 100644
--- a/templates/em3.mpd
+++ b/templates/em3.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(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" /stack:<%stack("0x10000,0x1000")%> <%if(type_is_dynamic)%>/entry:"_DllMainCRTStartup"<%endif%> /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%><%else%><%output_dir%><%endif%>\<%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%><%else%><%output_dir%><%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(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" <%stack%><%if(type_is_dynamic)%> /entry:"_DllMainCRTStartup"<%endif%> /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%><%else%><%output_dir%><%endif%>\<%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%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.exe<%endif%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/templates/em3vcp.mpd b/templates/em3vcp.mpd
index ee763f65..3dfd2349 100644
--- a/templates/em3vcp.mpd
+++ b/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(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" /stack:<%stack("0x10000,0x1000")%> <%if(type_is_dynamic)%>/entry:"_DllMainCRTStartup"<%endif%> /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%><%else%><%output_dir%><%endif%>\<%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%><%else%><%output_dir%><%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(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" <%stack%><%if(type_is_dynamic)%> /entry:"_DllMainCRTStartup"<%endif%> /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%><%else%><%output_dir%><%endif%>\<%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%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.exe<%endif%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/templates/em3vcpdll.mpt b/templates/em3vcpdll.mpt
index 3f8d8356..ffa52e8e 100644
--- a/templates/em3vcpdll.mpt
+++ b/templates/em3vcpdll.mpt
@@ -7,6 +7,7 @@ type_is_dynamic       = 1
 common_defines        = UNICODE _UNICODE
 ssl_libs              = libeay32 ssleay32
 pdb                   = 1
+stack                 =
 
 WCE x86 {
   type_code   = 0x8302
diff --git a/templates/em3vcpdllexe.mpt b/templates/em3vcpdllexe.mpt
index 9240a1aa..22db5900 100644
--- a/templates/em3vcpdllexe.mpt
+++ b/templates/em3vcpdllexe.mpt
@@ -7,6 +7,7 @@ type_is_binary        = 1
 common_defines        = UNICODE _UNICODE
 ssl_libs              = libeay32 ssleay32
 pdb                   = 1
+stack                 =
 
 WCE x86 {
   type_code   = 0x8301
diff --git a/templates/em3vcplib.mpt b/templates/em3vcplib.mpt
index 6edce407..adc00660 100644
--- a/templates/em3vcplib.mpt
+++ b/templates/em3vcplib.mpt
@@ -6,6 +6,7 @@ configurations        = "Static Release" "Static Debug"
 common_defines        = UNICODE _UNICODE
 type_is_static        = 1
 need_libflags         = 1
+stack                 =
 
 WCE x86 {
   type_code   = 0x8304
diff --git a/templates/em3vcplibexe.mpt b/templates/em3vcplibexe.mpt
index 284c220a..80e82de9 100644
--- a/templates/em3vcplibexe.mpt
+++ b/templates/em3vcplibexe.mpt
@@ -8,6 +8,7 @@ common_defines        = UNICODE _UNICODE
 ssl_libs              = libeay32 ssleay32
 need_libflags         = 1
 pdb                   = 1
+stack                 =
 
 WCE x86 {
   type_code   = 0x8301