ChangeLogTag: Wed Jul 16 08:38:49 2003 Chad Elliott <elliott_c@ociweb.com>

23 files changed, 69 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index e6cd8942c8c..36f36d2ed5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+Wed Jul 16 08:38:49 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/config/acedefaults.mpb:
+        * bin/MakeProjectCreator/config/openssl.mpb:
+        * bin/MakeProjectCreator/templates/bor.mpd:
+        * bin/MakeProjectCreator/templates/em3vcp.mpd:
+        * bin/MakeProjectCreator/templates/em3vcpdll.mpt:
+        * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt:
+        * bin/MakeProjectCreator/templates/em3vcplibexe.mpt:
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+        * bin/MakeProjectCreator/templates/gnudll.mpt:
+        * bin/MakeProjectCreator/templates/gnuexe.mpt:
+        * bin/MakeProjectCreator/templates/make.mpd:
+        * bin/MakeProjectCreator/templates/makedll.mpt:
+        * bin/MakeProjectCreator/templates/nmake.mpd:
+        * bin/MakeProjectCreator/templates/nmakedll.mpt:
+        * bin/MakeProjectCreator/templates/nmakeexe.mpt:
+        * bin/MakeProjectCreator/templates/vc6dsp.mpd:
+        * bin/MakeProjectCreator/templates/vc6dspdll.mpt:
+        * bin/MakeProjectCreator/templates/vc6dspdllexe.mpt:
+        * bin/MakeProjectCreator/templates/vc6dsplibexe.mpt:
+        * bin/MakeProjectCreator/templates/vc7.mpd:
+        * bin/MakeProjectCreator/templates/vc7dll.mpt:
+        * bin/MakeProjectCreator/templates/vc7exe.mpt:
+
+          Switched ssl over to use the feature based style instead of the
+          template style.  Now, the ssl related libraries will only be added
+          to the generated projects if the ssl feature is enabled.
+
 Wed Jul 16 08:00:10 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/config/acedefaults.mpb:
diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb
index f316f344eeb..70702c87dca 100644
--- a/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -1,4 +1,4 @@
-project: qt, zzip {
+project: qt, zzip, openssl {
   staticflags += ACE_AS_STATIC_LIBS
   includes    += $(ACE_ROOT)
   libpaths    += $(ACE_ROOT)/lib
diff --git a/bin/MakeProjectCreator/config/openssl.mpb b/bin/MakeProjectCreator/config/openssl.mpb
new file mode 100644
index 00000000000..04313394a02
--- /dev/null
+++ b/bin/MakeProjectCreator/config/openssl.mpb
@@ -0,0 +1,14 @@
+feature(ssl) {
+// When all of ACE and TAO are switched over to MPC, uncomment the
+// following lines and remove this comment.
+//  includes += $(SSL_ROOT)/include
+//  libpaths += $(SSL_ROOT)/lib
+
+  specific(borland, nmake, em3, vc6, vc7, vc71) {
+    lit_libs += libeay32 ssleay32
+  }
+
+  specific(gnuace, make) {
+    lit_libs += ssl crypto
+  }
+}
diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd
index eed66befae3..a1ef5bb5f49 100644
--- a/bin/MakeProjectCreator/templates/bor.mpd
+++ b/bin/MakeProjectCreator/templates/bor.mpd
@@ -20,9 +20,6 @@ OBJFILES = \
 <%endfor%>
 <%endif%>
 
-EXTERNAL_LIBS = \
-<%if(ssl)%><%foreach(ssl_libs)%> <%ssl_lib%>.lib<%endfor%><%endif%>
-
 LFLAGS = \
 <%foreach(libpaths)%>
 	-j<%libpath%>\$(CONFIG_SUBDIR) -j<%libpath%> \
@@ -38,7 +35,7 @@ LIBFILES = \
 <%foreach(lit_libs)%>
 	<%lit_lib%>.lib \
 <%endfor%>
-	$(EXTERNAL_LIBS)
+
 <%if(idl_files)%>
 
 IDLFILES = \
diff --git a/bin/MakeProjectCreator/templates/em3vcp.mpd b/bin/MakeProjectCreator/templates/em3vcp.mpd
index 8c7b9a17be9..23f3a4f5298 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(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:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%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)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%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")%> /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:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%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)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%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/bin/MakeProjectCreator/templates/em3vcpdll.mpt b/bin/MakeProjectCreator/templates/em3vcpdll.mpt
index b150419f156..8d2ec0a482b 100644
--- a/bin/MakeProjectCreator/templates/em3vcpdll.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcpdll.mpt
@@ -7,7 +7,6 @@ default_platform_long = "WCE ARM"
 type_is_binary        = 1
 type_is_dynamic       = 1
 common_defines        = UNICODE _UNICODE
-ssl_libs              = libeay32 ssleay32
 pdb                   = 1
 stack                 =
 
diff --git a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
index 1dde0cdaada..f8aabd11f58 100644
--- a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
@@ -7,7 +7,6 @@ default_platform_long = "WCE ARM"
 configurations        = Release Debug
 type_is_binary        = 1
 common_defines        = UNICODE _UNICODE
-ssl_libs              = libeay32 ssleay32
 pdb                   = 1
 stack                 =
 
diff --git a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
index 506ee98d93a..71afc5e2a5c 100644
--- a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
@@ -7,7 +7,6 @@ default_platform_long = "WCE ARM"
 configurations        = "Static Release" "Static Debug"
 type_is_binary        = 1
 common_defines        = UNICODE _UNICODE
-ssl_libs              = libeay32 ssleay32
 need_staticflags      = 1
 pdb                   = 1
 stack                 =
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index fb07f0dee3c..928f103d673 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -100,7 +100,14 @@ LIB   = $(LIB_UNCHECKED)
 <%if(sharedname)%>
 SHLIB = $(SHLIB_UNCHECKED)
 <%endif%>
-<%foreach(avoids requires)%>
+<%foreach(avoids)%>
+else
+  all: avoid_warning
+endif
+<%endfor%>
+<%foreach(requires)%>
+else
+  all: require_warning
 endif
 <%endfor%>
 <%if(tagname)%>
@@ -119,7 +126,14 @@ ifneq ($(<%avoid%>),1)
 <%foreach(tagchecks)%>
   endif
 <%endfor%>
-<%foreach(avoids requires)%>
+<%foreach(avoids)%>
+else
+  all: avoid_warning
+endif
+<%endfor%>
+<%foreach(requires)%>
+else
+  all: require_warning
 endif
 <%endfor%>
 endif
@@ -295,9 +309,6 @@ TAO_IDLFLAGS += <%idlflags%>
 <%if(lit_libs)%>
 <%if(exename)%>LDLIBS<%endif%><%if(sharedname)%>ACE_SHLIBS<%endif%> +=<%foreach(lit_libs)%> -l<%lit_lib%><%endfor%>
 <%endif%>
-<%if(ssl)%>
-<%if(exename)%>LDLIBS<%endif%><%if(sharedname)%>ACE_SHLIBS<%endif%> +=<%foreach(ssl_libs)%> -l<%ssl_lib%><%endfor%>
-<%endif%>
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
@@ -306,16 +317,19 @@ TAO_IDLFLAGS += <%idlflags%>
 comp_warning:
 	@echo This project will not be built due to one of the following missing components:
 	@echo<%foreach(comps)%> <%comp%><%endfor%>
+
 <%endif%>
 <%if(requires)%>
 require_warning:
 	@echo This project will not be built due to one of the following missing features:
 	@echo<%foreach(requires)%> <%require%><%endfor%>
+
 <%endif%>
 <%if(avoids)%>
 avoid_warning:
 	@echo This project will not be built due to one of the following enabled features:
 	@echo<%foreach(avoids)%> <%avoid%><%endfor%>
+
 <%endif%>
 <%if(custom_types)%>
 <%foreach(custom_types)%>
diff --git a/bin/MakeProjectCreator/templates/gnudll.mpt b/bin/MakeProjectCreator/templates/gnudll.mpt
index 09c88fcfcd7..02a06951a3b 100644
--- a/bin/MakeProjectCreator/templates/gnudll.mpt
+++ b/bin/MakeProjectCreator/templates/gnudll.mpt
@@ -1,3 +1 @@
 conditional_include "idl_compiler"
-
-ssl_libs = ssl crypto
diff --git a/bin/MakeProjectCreator/templates/gnuexe.mpt b/bin/MakeProjectCreator/templates/gnuexe.mpt
index 09c88fcfcd7..02a06951a3b 100644
--- a/bin/MakeProjectCreator/templates/gnuexe.mpt
+++ b/bin/MakeProjectCreator/templates/gnuexe.mpt
@@ -1,3 +1 @@
 conditional_include "idl_compiler"
-
-ssl_libs = ssl crypto
diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd
index 6407c88f5b0..a186089e94c 100644
--- a/bin/MakeProjectCreator/templates/make.mpd
+++ b/bin/MakeProjectCreator/templates/make.mpd
@@ -64,9 +64,6 @@ LDLIBS       +=<%foreach(defaultlibs)%> -l<%defaultlib%><%endfor%>
 <%if(lit_libs)%>
 LDLIBS       +=<%foreach(lit_libs)%> -l<%lit_lib%><%endfor%>
 <%endif%>
-<%if(ssl)%>
-LDLIBS       +=<%foreach(ssl_libs)%> -l<%ssl_lib%><%endfor%>
-<%endif%>
 OUTPUT_OPTION = -o $@
 <%marker(macros)%>
 
diff --git a/bin/MakeProjectCreator/templates/makedll.mpt b/bin/MakeProjectCreator/templates/makedll.mpt
index e06c57cd9df..785ff9df64a 100644
--- a/bin/MakeProjectCreator/templates/makedll.mpt
+++ b/bin/MakeProjectCreator/templates/makedll.mpt
@@ -2,7 +2,6 @@ conditional_include "idl_compiler"
 
 configurations = gcc
 soext          = so
-ssl_libs       = ssl crypto
 cppflags       =
 
 gcc {
diff --git a/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd
index 38281d36dde..9f2acfa011e 100644
--- a/bin/MakeProjectCreator/templates/nmake.mpd
+++ b/bin/MakeProjectCreator/templates/nmake.mpd
@@ -154,7 +154,7 @@ BSC32_SBRS= \
 
 <%if(type_is_binary)%>
 LINK32=link.exe
-LINK32_FLAGS=<%systemlibs("advapi32.lib user32.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%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%>/pdb:"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.pdb<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.pdb<%endif%>" <%endif%>/machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%if(sharedname)%> /implib:"$(OUTDIR)\<%sharedname%><%lib_modifier%>.lib"<%endif%>
+LINK32_FLAGS=<%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%>/pdb:"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.pdb<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.pdb<%endif%>" <%endif%>/machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%if(sharedname)%> /implib:"$(OUTDIR)\<%sharedname%><%lib_modifier%>.lib"<%endif%>
 <%endif%>
 <%if(type_is_static)%>
 LINK32=link.exe -lib
diff --git a/bin/MakeProjectCreator/templates/nmakedll.mpt b/bin/MakeProjectCreator/templates/nmakedll.mpt
index 0f02dee32ed..619dfa5ec26 100644
--- a/bin/MakeProjectCreator/templates/nmakedll.mpt
+++ b/bin/MakeProjectCreator/templates/nmakedll.mpt
@@ -29,7 +29,6 @@ Release {
   type_is_dynamic       = 1
   type_is_binary        = 1
   pdb                   = 1
-  ssl_libs              = libeay32 ssleay32
 }
 
 Debug {
@@ -44,7 +43,6 @@ Debug {
   type_is_dynamic       = 1
   type_is_binary        = 1
   pdb                   = 1
-  ssl_libs              = libeay32 ssleay32
 }
 
 Static Release {
@@ -89,7 +87,6 @@ MFC Release {
   type_is_dynamic       = 1
   type_is_binary        = 1
   pdb                   = 1
-  ssl_libs              = libeay32 ssleay32
 }
 
 MFC Debug {
@@ -104,7 +101,6 @@ MFC Debug {
   type_is_dynamic       = 1
   type_is_binary        = 1
   pdb                   = 1
-  ssl_libs              = libeay32 ssleay32
 }
 
 Static MFC Release {
diff --git a/bin/MakeProjectCreator/templates/nmakeexe.mpt b/bin/MakeProjectCreator/templates/nmakeexe.mpt
index 9cba700f18e..1ac7ec259f9 100644
--- a/bin/MakeProjectCreator/templates/nmakeexe.mpt
+++ b/bin/MakeProjectCreator/templates/nmakeexe.mpt
@@ -30,7 +30,6 @@ Release {
   output_dir            = Release
   intermediate_dir      = Release
   debug_switch          =
-  ssl_libs              = libeay32 ssleay32
 }
 
 Debug {
@@ -41,7 +40,6 @@ Debug {
   output_dir            = .
   intermediate_dir      = Debug
   lib_modifier          = d
-  ssl_libs              = libeay32 ssleay32
 }
 
 Static Release {
@@ -77,7 +75,6 @@ MFC Release {
   intermediate_dir      = MFC_Release
   lib_modifier          = mfc
   debug_switch          =
-  ssl_libs              = libeay32 ssleay32
 }
 
 MFC Debug {
@@ -89,7 +86,6 @@ MFC Debug {
   output_dir            = MFC_Debug
   intermediate_dir      = MFC_Debug
   lib_modifier          = mfcd
-  ssl_libs              = libeay32 ssleay32
 }
 
 Static MFC Release {
diff --git a/bin/MakeProjectCreator/templates/vc6dsp.mpd b/bin/MakeProjectCreator/templates/vc6dsp.mpd
index ed119637652..2dbb7802a0d 100644
--- a/bin/MakeProjectCreator/templates/vc6dsp.mpd
+++ b/bin/MakeProjectCreator/templates/vc6dsp.mpd
@@ -61,7 +61,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo <%if(sharedname)%>/o"<%libout%>\<%sharedname%>.bsc"<%endif%>
 <%if(type_is_binary)%>
 LINK32=link.exe
-# ADD LINK32 <%systemlibs("advapi32.lib user32.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%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.pdb"<%endif%><%endif%><%endif%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> /machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.exe<%endif%>"
+# ADD LINK32 <%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.pdb"<%endif%><%endif%><%endif%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> /machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.exe<%endif%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/bin/MakeProjectCreator/templates/vc6dspdll.mpt b/bin/MakeProjectCreator/templates/vc6dspdll.mpt
index 28929444464..50a8045c575 100644
--- a/bin/MakeProjectCreator/templates/vc6dspdll.mpt
+++ b/bin/MakeProjectCreator/templates/vc6dspdll.mpt
@@ -4,7 +4,6 @@ configurations  = Release Debug
 type_is_binary  = 1
 type_is_dynamic = 1
 common_defines  = WIN32 _WINDOWS
-ssl_libs        = libeay32 ssleay32
 pdb             = 1
 
 Release {
diff --git a/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt b/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt
index ca9244e7128..44d8f2c83eb 100644
--- a/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt
+++ b/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt
@@ -6,7 +6,6 @@ configurations   = Release Debug
 type_is_binary   = 1
 common_defines   = WIN32 _CONSOLE
 subsystem        = console
-ssl_libs         = libeay32 ssleay32
 pdb              = 1
 
 Release {
diff --git a/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt b/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt
index c94dec71034..2618128db7f 100644
--- a/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt
+++ b/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt
@@ -7,8 +7,7 @@ default_configuration = Debug
 type_is_binary        = 1
 common_defines        = WIN32 _CONSOLE
 subsystem             = console
-ssl_libs              = libeay32 ssleay32
-need_staticflags         = 1
+need_staticflags      = 1
 pdb                   = 1
 
 
diff --git a/bin/MakeProjectCreator/templates/vc7.mpd b/bin/MakeProjectCreator/templates/vc7.mpd
index f8b474a9a4a..fe547b05150 100644
--- a/bin/MakeProjectCreator/templates/vc7.mpd
+++ b/bin/MakeProjectCreator/templates/vc7.mpd
@@ -54,7 +54,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:<%machine("I386")%>"
 <%if(type_is_binary)%>
-				AdditionalDependencies="<%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib<%fornotlast(" ")%><%endfor%><%if(ssl)%><%foreach(ssl_libs)%> <%ssl_lib%>.lib<%endfor%><%endif%>"
+				AdditionalDependencies="<%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib<%fornotlast(" ")%><%endfor%>"
 <%endif%>
 				OutputFile="<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.exe<%endif%><%if(type_is_static)%><%libout%>\<%staticname%><%lib_modifier%>.lib<%endif%>"
 				Version="<%version("1.0")%>"
diff --git a/bin/MakeProjectCreator/templates/vc7dll.mpt b/bin/MakeProjectCreator/templates/vc7dll.mpt
index cc4ba509e7e..69560940033 100644
--- a/bin/MakeProjectCreator/templates/vc7dll.mpt
+++ b/bin/MakeProjectCreator/templates/vc7dll.mpt
@@ -2,7 +2,6 @@ conditional_include "idl_compiler_win32"
 
 configurations     = Release Debug "Static Release" "Static Debug"
 common_defines     = WIN32 _WINDOWS
-ssl_libs           = libeay32 ssleay32
 
 Release {
   type_is_dynamic  = 1
diff --git a/bin/MakeProjectCreator/templates/vc7exe.mpt b/bin/MakeProjectCreator/templates/vc7exe.mpt
index 774190c5ef2..03e3d00b0df 100644
--- a/bin/MakeProjectCreator/templates/vc7exe.mpt
+++ b/bin/MakeProjectCreator/templates/vc7exe.mpt
@@ -5,7 +5,6 @@ type_is_binary     = 1
 common_defines     = WIN32 _CONSOLE
 configuration_type = 1
 subsystem          = 1
-ssl_libs           = libeay32 ssleay32
 pdb                = 1
 
 Release {