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

25 files changed, 29 insertions, 93 deletions

diff --git a/templates/em3.mpd b/templates/em3.mpd
index 17415167..8c7b9a17 100644
--- a/templates/em3.mpd
+++ b/templates/em3.mpd
@@ -61,7 +61,7 @@ LINK32=link.exe -lib
 RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CePlatform)"<%foreach(defines common_defines cpu_defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> /r
 CPP=<%cpp("cl.exe")%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
+# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
@@ -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%><%if(zzip)%><%foreach(zzip_libs)%><%zzip_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%><%if(zzip)%>/libpath:"$(ZZIP_ROOT)\lib" <%endif%>/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")%> <%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%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/templates/em3vcp.mpd b/templates/em3vcp.mpd
index 17415167..8c7b9a17 100644
--- a/templates/em3vcp.mpd
+++ b/templates/em3vcp.mpd
@@ -61,7 +61,7 @@ LINK32=link.exe -lib
 RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CePlatform)"<%foreach(defines common_defines cpu_defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> /r
 CPP=<%cpp("cl.exe")%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
+# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
@@ -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%><%if(zzip)%><%foreach(zzip_libs)%><%zzip_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%><%if(zzip)%>/libpath:"$(ZZIP_ROOT)\lib" <%endif%>/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")%> <%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%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/templates/em3vcpdll.mpt b/templates/em3vcpdll.mpt
index de5e2768..b150419f 100644
--- a/templates/em3vcpdll.mpt
+++ b/templates/em3vcpdll.mpt
@@ -8,7 +8,6 @@ type_is_binary        = 1
 type_is_dynamic       = 1
 common_defines        = UNICODE _UNICODE
 ssl_libs              = libeay32 ssleay32
-zzip_libs             = z zzip
 pdb                   = 1
 stack                 =
 
@@ -79,4 +78,3 @@ MFC Debug {
 }
 
 conditional_include "vcpartialmacros"
-conditional_include "zziplib"
diff --git a/templates/em3vcpdllexe.mpt b/templates/em3vcpdllexe.mpt
index 307953ee..1dde0cda 100644
--- a/templates/em3vcpdllexe.mpt
+++ b/templates/em3vcpdllexe.mpt
@@ -8,7 +8,6 @@ configurations        = Release Debug
 type_is_binary        = 1
 common_defines        = UNICODE _UNICODE
 ssl_libs              = libeay32 ssleay32
-zzip_libs             = z zzip
 pdb                   = 1
 stack                 =
 
@@ -79,4 +78,3 @@ MFC Debug {
 }
 
 conditional_include "vcpartialmacros"
-conditional_include "zziplib"
diff --git a/templates/em3vcplib.mpt b/templates/em3vcplib.mpt
index fb647367..dbbf795d 100644
--- a/templates/em3vcplib.mpt
+++ b/templates/em3vcplib.mpt
@@ -80,4 +80,4 @@ MFC Debug {
 }
 
 conditional_include "vcpartialmacros"
-conditional_include "zziplib"
+
diff --git a/templates/em3vcplibexe.mpt b/templates/em3vcplibexe.mpt
index 8ef62af7..506ee98d 100644
--- a/templates/em3vcplibexe.mpt
+++ b/templates/em3vcplibexe.mpt
@@ -80,4 +80,4 @@ MFC Debug {
 }
 
 conditional_include "vcpartialmacros"
-conditional_include "zziplib"
+
diff --git a/templates/make.mpd b/templates/make.mpd
index f9dc3ad2..6407c88f 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -29,10 +29,6 @@ SHFLAGS       = <%shflags%>
 CPPFLAGS     += <%cppflags%>
 <%endif%>
 <%endfor%>
-<%if(zzip)%>
-CPPFLAGS     += -I$(ZZIP_ROOT)/include
-CPPFLAGS     +=<%foreach(zzip_defines)%> -D<%zzip_define%><%endfor%>
-<%endif%>
 <%if(pch_header)%>
 CPPFLAGS     +=<%foreach(pch_defines)%> -D<%pch_define%><%endfor%>
 <%endif%>
@@ -55,9 +51,6 @@ LDFLAGS      +=<%foreach(libpaths)%> -L<%libpath%><%endfor%>
 <%if(linkflags)%>
 LDFLAGS      += <%linkflags%>
 <%endif%>
-<%if(zzip)%>
-LDFLAGS     += -L$(ZZIP_ROOT)/lib
-<%endif%>
 <%endfor%>
 <%foreach(platforms)%>
 LDLIBS       += <%ldlibs%>
@@ -74,9 +67,6 @@ LDLIBS       +=<%foreach(lit_libs)%> -l<%lit_lib%><%endfor%>
 <%if(ssl)%>
 LDLIBS       +=<%foreach(ssl_libs)%> -l<%ssl_lib%><%endfor%>
 <%endif%>
-<%if(zzip)%>
-LDLIBS       +=<%foreach(zzip_libs)%> -l<%zzip_lib%><%endfor%>
-<%endif%>
 OUTPUT_OPTION = -o $@
 <%marker(macros)%>
 
diff --git a/templates/makedll.mpt b/templates/makedll.mpt
index 8fb574e1..e06c57cd 100644
--- a/templates/makedll.mpt
+++ b/templates/makedll.mpt
@@ -3,7 +3,6 @@ conditional_include "idl_compiler"
 configurations = gcc
 soext          = so
 ssl_libs       = ssl crypto
-zzip_libs      = z zziplib
 cppflags       =
 
 gcc {
@@ -40,5 +39,3 @@ hpux {
   soext  = sl
   ldlibs = -lxti -lpthread -lrt -ldld
 }
-
-conditional_include "zziplib"
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index 2304e49c..38281d36 100644
--- a/templates/nmake.mpd
+++ b/templates/nmake.mpd
@@ -110,7 +110,7 @@ REALCLEAN : CLEAN
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%><%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c
+CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -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%><%if(zzip)%><%foreach(zzip_libs)%><%zzip_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%><%if(zzip)%>/libpath: "$(ZZIP_ROOT)\lib" <%endif%>/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")%> <%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%>
 <%endif%>
 <%if(type_is_static)%>
 LINK32=link.exe -lib
diff --git a/templates/nmakedll.mpt b/templates/nmakedll.mpt
index 3c514b15..0f02dee3 100644
--- a/templates/nmakedll.mpt
+++ b/templates/nmakedll.mpt
@@ -30,7 +30,6 @@ Release {
   type_is_binary        = 1
   pdb                   = 1
   ssl_libs              = libeay32 ssleay32
-  zzip_libs             = z zzip
 }
 
 Debug {
@@ -46,7 +45,6 @@ Debug {
   type_is_binary        = 1
   pdb                   = 1
   ssl_libs              = libeay32 ssleay32
-  zzip_libs             = z zzip
 }
 
 Static Release {
@@ -92,7 +90,6 @@ MFC Release {
   type_is_binary        = 1
   pdb                   = 1
   ssl_libs              = libeay32 ssleay32
-  zzip_libs             = z zzip
 }
 
 MFC Debug {
@@ -108,7 +105,6 @@ MFC Debug {
   type_is_binary        = 1
   pdb                   = 1
   ssl_libs              = libeay32 ssleay32
-  zzip_libs             = z zzip
 }
 
 Static MFC Release {
@@ -141,4 +137,3 @@ Static MFC Debug {
 }
 
 conditional_include "vcfullmacros"
-conditional_include "zziplib"
diff --git a/templates/nmakeexe.mpt b/templates/nmakeexe.mpt
index eca1cc70..9cba700f 100644
--- a/templates/nmakeexe.mpt
+++ b/templates/nmakeexe.mpt
@@ -31,7 +31,6 @@ Release {
   intermediate_dir      = Release
   debug_switch          =
   ssl_libs              = libeay32 ssleay32
-  zzip_libs             = z zzip
 }
 
 Debug {
@@ -43,7 +42,6 @@ Debug {
   intermediate_dir      = Debug
   lib_modifier          = d
   ssl_libs              = libeay32 ssleay32
-  zzip_libs             = z zzip
 }
 
 Static Release {
@@ -80,7 +78,6 @@ MFC Release {
   lib_modifier          = mfc
   debug_switch          =
   ssl_libs              = libeay32 ssleay32
-  zzip_libs             = z zzip
 }
 
 MFC Debug {
@@ -93,7 +90,6 @@ MFC Debug {
   intermediate_dir      = MFC_Debug
   lib_modifier          = mfcd
   ssl_libs              = libeay32 ssleay32
-  zzip_libs             = z zzip
 }
 
 Static MFC Release {
@@ -122,4 +118,3 @@ Static MFC Debug {
 }
 
 conditional_include "vcfullmacros"
-conditional_include "zziplib"
diff --git a/templates/va4icc.mpd b/templates/va4icc.mpd
index 51107033..591c91d4 100644
--- a/templates/va4icc.mpd
+++ b/templates/va4icc.mpd
@@ -6,11 +6,6 @@ if $__TOS_WIN__ {
 <%foreach(defines common_defines macros)%>
                 define ("<%define%>", "1"),
 <%endfor%>
-<%if(zzip)%>
-<%foreach(zzip_defines)%>
-                define ("<%zzip_define%>", "1"),
-<%endfor%>
-<%endif%>
 <%if(type_is_dynamic)%>
 <%foreach(dynamicflags)%>
                 define ("<%dynamicflag%>", "1"),
@@ -54,16 +49,10 @@ option
 <%foreach(includes)%>
          incl(searchPath, '<%include%>'),
 <%endfor%>
-<%if(zzip)%>
-         incl(searchPath, '$(ZZIP_ROOT)/include'),
-<%endif%>
 <%if(sharedname)%>
          link(exportAll),
 <%endif%>
          link(linkwithsharedlib),
-<%if(zzip)%>
-         link(libSearchPath, '$(ZZIP_ROOT)/lib'),
-<%endif%>
 <%foreach(libpaths)%>
          link(libSearchPath, '<%libpath%>'),
 <%endfor%>
@@ -105,11 +94,6 @@ option
                        source type (lib) "ws2_32.lib"
                        source type (lib) "wsock32.lib"
                        source type (lib) "mswsock.lib"
-<%if(zzip)%>
-<%foreach(zzip_libs)%>
-                       source type (lib) "<%zzip_lib%>.lib"
-<%endfor%>
-<%endif%>
 <%foreach(lit_libs)%>
                        source type (lib) "<%lit_lib%>.lib"
 <%endfor%>
@@ -141,11 +125,6 @@ option
 <%foreach(libs defaultlibs lit_libs)%>
                        source type (lib) "lib<%lib%>.a"
 <%endfor%>
-<%if(zzip)%>
-<%foreach(zzip_libs)%>
-                       source type (lib) "lib<%zzip_lib%>.a"
-<%endfor%>
-<%endif%>
 
 <%if(type_is_dynamic)%>
                        source type (lib) "libtli_r.a"
diff --git a/templates/va4iccdll.mpt b/templates/va4iccdll.mpt
index bc49da13..e41f88a7 100644
--- a/templates/va4iccdll.mpt
+++ b/templates/va4iccdll.mpt
@@ -4,4 +4,3 @@ common_defines  = _WINDOWS WIN32
 type_is_dynamic = 1
 lib_modifier    = d
 defines         = _DEBUG
-conditional_include "zziplib"
diff --git a/templates/va4iccdllexe.mpt b/templates/va4iccdllexe.mpt
index 893387a1..ef7acae0 100644
--- a/templates/va4iccdllexe.mpt
+++ b/templates/va4iccdllexe.mpt
@@ -1,7 +1,6 @@
 conditional_include "idl_compiler_win32"
 
-common_defines  = _WINDOWS _CONSOLE
-type_is_binary  = 1
-lib_modifier    = d
-defines         = _DEBUG
-conditional_include "zziplib"
+common_defines = _WINDOWS _CONSOLE
+type_is_binary = 1
+lib_modifier   = d
+defines        = _DEBUG
diff --git a/templates/va4icclib.mpt b/templates/va4icclib.mpt
index 95237c4a..d484f7b4 100644
--- a/templates/va4icclib.mpt
+++ b/templates/va4icclib.mpt
@@ -1,7 +1,6 @@
 conditional_include "idl_compiler_win32"
 
-common_defines  = _WINDOWS WIN32
-type_is_static  = 1
-lib_modifier    = d
-defines         = _DEBUG
-conditional_include "zziplib"
+common_defines = _WINDOWS WIN32
+type_is_static = 1
+lib_modifier   = d
+defines        = _DEBUG
diff --git a/templates/va4icclibexe.mpt b/templates/va4icclibexe.mpt
index 01da5ffb..b9ee757d 100644
--- a/templates/va4icclibexe.mpt
+++ b/templates/va4icclibexe.mpt
@@ -1,9 +1,7 @@
 conditional_include "idl_compiler_win32"
 
-common_defines  = _WINDOWS _CONSOLE
-type_is_binary  = 1
-lib_modifier    = d
-defines         = _DEBUG
-need_staticflags   = 1
-conditional_include "zziplib"
-
+common_defines   = _WINDOWS _CONSOLE
+type_is_binary   = 1
+lib_modifier     = d
+defines          = _DEBUG
+need_staticflags = 1
diff --git a/templates/vc6.mpd b/templates/vc6.mpd
index 94e720ce..ed119637 100644
--- a/templates/vc6.mpd
+++ b/templates/vc6.mpd
@@ -52,7 +52,7 @@ RSC=rc.exe
 <%if(type_is_static)%>
 LINK32=link.exe -lib
 <%endif%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
+# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
@@ -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(zzip)%><%foreach(zzip_libs)%><%zzip_lib%>.lib <%endfor%><%endif%><%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%><%if(zzip)%>/libpath:"$(ZZIP_ROOT)\lib" <%endif%>/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")%> <%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%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/templates/vc6dsp.mpd b/templates/vc6dsp.mpd
index 94e720ce..ed119637 100644
--- a/templates/vc6dsp.mpd
+++ b/templates/vc6dsp.mpd
@@ -52,7 +52,7 @@ RSC=rc.exe
 <%if(type_is_static)%>
 LINK32=link.exe -lib
 <%endif%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
+# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
@@ -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(zzip)%><%foreach(zzip_libs)%><%zzip_lib%>.lib <%endfor%><%endif%><%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%><%if(zzip)%>/libpath:"$(ZZIP_ROOT)\lib" <%endif%>/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")%> <%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%>"
 <%if(link_flags_removed)%>
 # SUBTRACT LINK32 <%link_flags_removed%>
 <%endif%>
diff --git a/templates/vc6dspdll.mpt b/templates/vc6dspdll.mpt
index 478e8c60..28929444 100644
--- a/templates/vc6dspdll.mpt
+++ b/templates/vc6dspdll.mpt
@@ -5,7 +5,6 @@ type_is_binary  = 1
 type_is_dynamic = 1
 common_defines  = WIN32 _WINDOWS
 ssl_libs        = libeay32 ssleay32
-zzip_libs       = z zzip
 pdb             = 1
 
 Release {
@@ -51,4 +50,3 @@ MFC Debug {
 }
 
 conditional_include "vcpartialmacros"
-conditional_include "zziplib"
diff --git a/templates/vc6dspdllexe.mpt b/templates/vc6dspdllexe.mpt
index 6ddbfe38..ca9244e7 100644
--- a/templates/vc6dspdllexe.mpt
+++ b/templates/vc6dspdllexe.mpt
@@ -7,7 +7,6 @@ type_is_binary   = 1
 common_defines   = WIN32 _CONSOLE
 subsystem        = console
 ssl_libs         = libeay32 ssleay32
-zzip_libs        = z zzip
 pdb              = 1
 
 Release {
@@ -58,4 +57,3 @@ MFC Debug {
 }
 
 conditional_include "vcpartialmacros"
-conditional_include "zziplib"
diff --git a/templates/vc6dsplib.mpt b/templates/vc6dsplib.mpt
index 4a75f918..a276a7e4 100644
--- a/templates/vc6dsplib.mpt
+++ b/templates/vc6dsplib.mpt
@@ -56,4 +56,3 @@ MFC Debug {
 }
 
 conditional_include "vcpartialmacros"
-conditional_include "zziplib"
diff --git a/templates/vc6dsplibexe.mpt b/templates/vc6dsplibexe.mpt
index 2fd53c5e..c94dec71 100644
--- a/templates/vc6dsplibexe.mpt
+++ b/templates/vc6dsplibexe.mpt
@@ -8,7 +8,6 @@ type_is_binary        = 1
 common_defines        = WIN32 _CONSOLE
 subsystem             = console
 ssl_libs              = libeay32 ssleay32
-zzip_libs             = z zzip
 need_staticflags         = 1
 pdb                   = 1
 
@@ -60,4 +59,3 @@ MFC Debug {
 }
 
 conditional_include "vcpartialmacros"
-conditional_include "zziplib"
diff --git a/templates/vc7.mpd b/templates/vc7.mpd
index b02bb504..f8b474a9 100644
--- a/templates/vc7.mpd
+++ b/templates/vc7.mpd
@@ -27,8 +27,8 @@
 <%if(!debug)%>
 				InlineFunctionExpansion="<%inline("2")%>"
 <%endif%>
-				AdditionalIncludeDirectories="<%foreach(includes)%><%include%><%fornotlast(",")%><%endfor%><%if(zzip)%>,$(ZZIP_ROOT)\include<%endif%>"
-				PreprocessorDefinitions="<%if(type_is_dynamic)%><%foreach(dynamicflags)%><%dynamicflag%>;<%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%><%zzip_define%>;<%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%><%libflag%>;<%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%><%pch_define%>;<%endfor%><%endif%><%foreach(defines common_defines macros)%><%define%><%fornotlast(";")%><%endfor%>"
+				AdditionalIncludeDirectories="<%foreach(includes)%><%include%><%fornotlast(",")%><%endfor%>"
+				PreprocessorDefinitions="<%if(type_is_dynamic)%><%foreach(dynamicflags)%><%dynamicflag%>;<%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%><%libflag%>;<%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%><%pch_define%>;<%endfor%><%endif%><%foreach(defines common_defines macros)%><%define%><%fornotlast(";")%><%endfor%>"
 <%if(!debug)%>
 				StringPooling="<%string_pooling("TRUE")%>"
 <%endif%>
@@ -54,13 +54,13 @@
 				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%><%if(zzip)%><%foreach(zzip_libs)%> <%zzip_lib%>.lib<%endfor%><%endif%>"
+				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%>"
 <%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")%>"
 				LinkIncremental="<%incremental("1")%>"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="<%foreach(libpaths)%><%libpath%><%fornotlast(";")%><%endfor%><%if(zzip)%>;$(ZZIP_ROOT)\lib<%endif%>"
+				AdditionalLibraryDirectories="<%foreach(libpaths)%><%libpath%><%fornotlast(";")%><%endfor%>"
 <%if(debug)%>
 				GenerateDebugInformation="TRUE"
 <%endif%>
diff --git a/templates/vc7dll.mpt b/templates/vc7dll.mpt
index 8e00dfa0..cc4ba509 100644
--- a/templates/vc7dll.mpt
+++ b/templates/vc7dll.mpt
@@ -3,7 +3,6 @@ conditional_include "idl_compiler_win32"
 configurations     = Release Debug "Static Release" "Static Debug"
 common_defines     = WIN32 _WINDOWS
 ssl_libs           = libeay32 ssleay32
-zzip_libs          = z zzip
 
 Release {
   type_is_dynamic  = 1
@@ -101,4 +100,3 @@ Static MFC Debug {
 }
 
 conditional_include "vcfullmacros"
-conditional_include "zziplib"
diff --git a/templates/vc7exe.mpt b/templates/vc7exe.mpt
index a2eaebe1..774190c5 100644
--- a/templates/vc7exe.mpt
+++ b/templates/vc7exe.mpt
@@ -6,7 +6,6 @@ common_defines     = WIN32 _CONSOLE
 configuration_type = 1
 subsystem          = 1
 ssl_libs           = libeay32 ssleay32
-zzip_libs          = z zzip
 pdb                = 1
 
 Release {
@@ -91,4 +90,3 @@ Static MFC Debug {
 }
 
 conditional_include "vcfullmacros"
-conditional_include "zziplib"