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

18 files changed, 7 insertions, 27 deletions

diff --git a/templates/em3.mpd b/templates/em3.mpd
index 8c7b9a17..23f3a4f5 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%><%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/templates/em3vcp.mpd b/templates/em3vcp.mpd
index 8c7b9a17..23f3a4f5 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%><%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/templates/em3vcpdll.mpt b/templates/em3vcpdll.mpt
index b150419f..8d2ec0a4 100644
--- a/templates/em3vcpdll.mpt
+++ b/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/templates/em3vcpdllexe.mpt b/templates/em3vcpdllexe.mpt
index 1dde0cda..f8aabd11 100644
--- a/templates/em3vcpdllexe.mpt
+++ b/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/templates/em3vcplibexe.mpt b/templates/em3vcplibexe.mpt
index 506ee98d..71afc5e2 100644
--- a/templates/em3vcplibexe.mpt
+++ b/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/templates/make.mpd b/templates/make.mpd
index 6407c88f..a186089e 100644
--- a/templates/make.mpd
+++ b/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/templates/makedll.mpt b/templates/makedll.mpt
index e06c57cd..785ff9df 100644
--- a/templates/makedll.mpt
+++ b/templates/makedll.mpt
@@ -2,7 +2,6 @@ conditional_include "idl_compiler"
 
 configurations = gcc
 soext          = so
-ssl_libs       = ssl crypto
 cppflags       =
 
 gcc {
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index 38281d36..9f2acfa0 100644
--- a/templates/nmake.mpd
+++ b/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/templates/nmakedll.mpt b/templates/nmakedll.mpt
index 0f02dee3..619dfa5e 100644
--- a/templates/nmakedll.mpt
+++ b/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/templates/nmakeexe.mpt b/templates/nmakeexe.mpt
index 9cba700f..1ac7ec25 100644
--- a/templates/nmakeexe.mpt
+++ b/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/templates/vc6.mpd b/templates/vc6.mpd
index ed119637..2dbb7802 100644
--- a/templates/vc6.mpd
+++ b/templates/vc6.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/templates/vc6dsp.mpd b/templates/vc6dsp.mpd
index ed119637..2dbb7802 100644
--- a/templates/vc6dsp.mpd
+++ b/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/templates/vc6dspdll.mpt b/templates/vc6dspdll.mpt
index 28929444..50a8045c 100644
--- a/templates/vc6dspdll.mpt
+++ b/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/templates/vc6dspdllexe.mpt b/templates/vc6dspdllexe.mpt
index ca9244e7..44d8f2c8 100644
--- a/templates/vc6dspdllexe.mpt
+++ b/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/templates/vc6dsplibexe.mpt b/templates/vc6dsplibexe.mpt
index c94dec71..2618128d 100644
--- a/templates/vc6dsplibexe.mpt
+++ b/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/templates/vc7.mpd b/templates/vc7.mpd
index f8b474a9..fe547b05 100644
--- a/templates/vc7.mpd
+++ b/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/templates/vc7dll.mpt b/templates/vc7dll.mpt
index cc4ba509..69560940 100644
--- a/templates/vc7dll.mpt
+++ b/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/templates/vc7exe.mpt b/templates/vc7exe.mpt
index 774190c5..03e3d00b 100644
--- a/templates/vc7exe.mpt
+++ b/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 {