* Discarded extra deflate function needed for afm reading

- as a result, discarded the whole chain of support functions, .c files and includes needed to make that one function run
- also removed zlib compile/link dependencies where they are not needed
- reduced the whole zlib package into two core include files
- adjusted makefiles / project files to reflect this change 

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10273 54d463be-8e91-2dee-dedb-b68131a5f0ec

6 files changed, 6 insertions, 230 deletions

diff --git a/vcproj-6/char-server_sql.dsp b/vcproj-6/char-server_sql.dsp
index 1e2f4e88a..6113b8040 100644
--- a/vcproj-6/char-server_sql.dsp
+++ b/vcproj-6/char-server_sql.dsp
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_sql/char-server_sql.pch" /YX /Fo"tmp/char_sql/" /Fd"tmp/char_sql/" /FD /c

+# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_sql/char-server_sql.pch" /YX /Fo"tmp/char_sql/" /Fd"tmp/char_sql/" /FD /c

 # ADD BASE RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

@@ -250,45 +250,5 @@ SOURCE=..\src\char_sql\itemdb.c
 SOURCE=..\src\char_sql\itemdb.h

 # End Source File

 # End Group

-# Begin Group "zlib"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\src\zlib\crypt.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\zconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\zlib.h

-# End Source File

-# End Group

 # End Target

 # End Project

diff --git a/vcproj-6/char-server_txt.dsp b/vcproj-6/char-server_txt.dsp
index 932b9e84e..23b0c42a9 100644
--- a/vcproj-6/char-server_txt.dsp
+++ b/vcproj-6/char-server_txt.dsp
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_txt/char-server_txt.pch" /YX /Fo"tmp/char_txt/" /Fd"tmp/char_txt/" /FD /c

+# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_txt/char-server_txt.pch" /YX /Fo"tmp/char_txt/" /Fd"tmp/char_txt/" /FD /c

 # ADD BASE RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

@@ -250,45 +250,5 @@ SOURCE=..\src\char\inter.c
 SOURCE=..\src\char\inter.h

 # End Source File

 # End Group

-# Begin Group "zlib"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\src\zlib\crypt.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\zconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\zlib.h

-# End Source File

-# End Group

 # End Target

 # End Project

diff --git a/vcproj-6/login-server_sql.dsp b/vcproj-6/login-server_sql.dsp
index 0289fb526..3f5b789be 100644
--- a/vcproj-6/login-server_sql.dsp
+++ b/vcproj-6/login-server_sql.dsp
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/login_sql/login-server_sql.pch" /YX /Fo"tmp/login_sql/" /Fd"tmp/login_sql/" /FD /c

+# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/login_sql/login-server_sql.pch" /YX /Fo"tmp/login_sql/" /Fd"tmp/login_sql/" /FD /c

 # ADD BASE RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

@@ -206,45 +206,5 @@ SOURCE=..\src\login_sql\login.c
 SOURCE=..\src\login_sql\login.h

 # End Source File

 # End Group

-# Begin Group "zlib"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\src\zlib\crypt.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\zconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\zlib.h

-# End Source File

-# End Group

 # End Target

 # End Project

diff --git a/vcproj-6/login-server_txt.dsp b/vcproj-6/login-server_txt.dsp
index 8f4380c43..cb30ae2a1 100644
--- a/vcproj-6/login-server_txt.dsp
+++ b/vcproj-6/login-server_txt.dsp
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/login_txt/login-server_txt.pch" /YX /Fo"tmp/login_txt/" /Fd"tmp/login_txt/" /FD /c

+# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/login_txt/login-server_txt.pch" /YX /Fo"tmp/login_txt/" /Fd"tmp/login_txt/" /FD /c

 # ADD BASE RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

@@ -202,45 +202,5 @@ SOURCE=..\src\login\login.c
 SOURCE=..\src\login\login.h

 # End Source File

 # End Group

-# Begin Group "zlib"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\src\zlib\crypt.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\zconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\zlib.h

-# End Source File

-# End Group

 # End Target

 # End Project

diff --git a/vcproj-6/map-server_sql.dsp b/vcproj-6/map-server_sql.dsp
index bbe8539f6..6bdce882c 100644
--- a/vcproj-6/map-server_sql.dsp
+++ b/vcproj-6/map-server_sql.dsp
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_sql/map-server_sql.pch" /YX /Fo"tmp/map_sql/" /Fd"tmp/map_sql/" /FD /c

+# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_sql/map-server_sql.pch" /YX /Fo"tmp/map_sql/" /Fd"tmp/map_sql/" /FD /c

 # ADD BASE RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

@@ -419,34 +419,6 @@ SOURCE=..\src\map\vending.h
 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=..\src\zlib\crypt.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\src\zlib\zconf.h

 # End Source File

 # Begin Source File

diff --git a/vcproj-6/map-server_txt.dsp b/vcproj-6/map-server_txt.dsp
index a46b752ca..86dd8b532 100644
--- a/vcproj-6/map-server_txt.dsp
+++ b/vcproj-6/map-server_txt.dsp
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_txt/map-server_txt.pch" /YX /Fo"tmp/map_txt/" /Fd"tmp/map_txt/" /FD /c

+# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_txt/map-server_txt.pch" /YX /Fo"tmp/map_txt/" /Fd"tmp/map_txt/" /FD /c

 # ADD BASE RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

@@ -189,9 +189,6 @@ SOURCE=..\src\common\version.h
 # Begin Group "map"

 

 # PROP Default_Filter ""

-# Begin Group "cpp"

-

-# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=..\src\map\atcommand.c

@@ -308,10 +305,6 @@ SOURCE=..\src\map\unit.c
 

 SOURCE=..\src\map\vending.c

 # End Source File

-# End Group

-# Begin Group "h"

-

-# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=..\src\map\atcommand.h

@@ -425,40 +418,11 @@ SOURCE=..\src\map\unit.h
 SOURCE=..\src\map\vending.h

 # End Source File

 # End Group

-# End Group

 # Begin Group "zlib"

 

 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=..\src\zlib\crypt.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\ioapi.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\iowin32.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\zlib\unzip.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\src\zlib\zconf.h

 # End Source File

 # Begin Source File