* Fixed various sorts of issues with VS6 project files (since r6929, follow up to r14466 and r14638).

- Debug configuration was missing and release had _DEBUG defined (indicates debug configuration).
- Login-server (SQL) defined PACKETVER=6 (overrides mmo.h).
- Warning Level was 2, which hides a lot of actual errors.
- Added projects for mapcache and TXT converter.
- Removed references unneeded/obsolete libraries/source files.

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

1 files changed, 67 insertions, 41 deletions

diff --git a/vcproj-6/map-server_sql.dsp b/vcproj-6/map-server_sql.dsp
index a74c642c4..bf4249972 100644
--- a/vcproj-6/map-server_sql.dsp
+++ b/vcproj-6/map-server_sql.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=map_sql - Win32 Release
+CFG=map_sql - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,11 +13,12 @@ CFG=map_sql - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "map-server_sql.mak" CFG="map_sql - Win32 Release"
+!MESSAGE NMAKE /f "map-server_sql.mak" CFG="map_sql - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "map_sql - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "map_sql - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -26,6 +27,9 @@ CFG=map_sql - Win32 Release
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
+
+!IF  "$(CFG)" == "map_sql - Win32 Release"
+
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
@@ -33,23 +37,53 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\map_sql\Release"
 # 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 "..\3rdparty\mysql\include" /I "..\3rdparty\zlib\include" /I "..\3rdparty\pcre\include" /I "..\3rdparty\msinttypes\include" /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
+# ADD CPP /nologo /W3 /Zi /O2 /I "..\3rdparty\mysql\include" /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\pcre\include" /I "..\3rdparty\zlib\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "PCRE_SUPPORT" /FD /GF /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "NDEBUG"
+# ADD RSC /l 0x417 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 WSOCK32.lib libmysql.lib zdll.lib pcre.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/map_sql/map-server_sql.pdb" /machine:I386 /out:"../map-server_sql.exe" /libpath:"..\3rdparty\mysql\lib" /libpath:"..\3rdparty\zlib\lib" /libpath:"..\3rdparty\pcre\lib"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 libmysql.lib kernel32.lib ws2_32.lib pcre.lib zdll.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\3rdparty\mysql\lib" /libpath:"..\3rdparty\pcre\lib" /libpath:"..\3rdparty\zlib\lib"
+
+!ELSEIF  "$(CFG)" == "map_sql - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "tmp\map_sql\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /Gi /ZI /Od /I "..\3rdparty\mysql\include" /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\pcre\include" /I "..\3rdparty\zlib\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "PCRE_SUPPORT" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x405 /d "_DEBUG"
+# ADD RSC /l 0x417 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 libmysql.lib kernel32.lib ws2_32.lib pcre.lib zdll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\3rdparty\mysql\lib" /libpath:"..\3rdparty\pcre\lib" /libpath:"..\3rdparty\zlib\lib"
+
+!ENDIF 
+
 # Begin Target
 
 # Name "map_sql - Win32 Release"
+# Name "map_sql - Win32 Debug"
 # Begin Group "common"
 
 # PROP Default_Filter ""
@@ -91,14 +125,6 @@ SOURCE=..\src\common\grfio.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\lock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\common\lock.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\common\malloc.c
 # End Source File
 # Begin Source File
@@ -107,19 +133,19 @@ SOURCE=..\src\common\malloc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\md5calc.c
+SOURCE=..\src\common\mapindex.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\md5calc.h
+SOURCE=..\src\common\mapindex.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\mapindex.c
+SOURCE=..\src\common\md5calc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\mapindex.h
+SOURCE=..\src\common\md5calc.h
 # End Source File
 # Begin Source File
 
@@ -179,10 +205,6 @@ SOURCE=..\src\common\strlib.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\svnversion.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\common\timer.c
 # End Source File
 # Begin Source File
@@ -202,7 +224,7 @@ SOURCE=..\src\common\utils.h
 SOURCE=..\src\common\version.h
 # End Source File
 # End Group
-# Begin Group "map"
+# Begin Group "map_sql"
 
 # PROP Default_Filter ""
 # Begin Source File
@@ -287,67 +309,67 @@ SOURCE=..\src\map\guild.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\intif.c
+SOURCE=..\src\map\homunculus.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\intif.h
+SOURCE=..\src\map\homunculus.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\itemdb.c
+SOURCE=..\src\map\instance.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\itemdb.h
+SOURCE=..\src\map\instance.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\log.c
+SOURCE=..\src\map\intif.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\log.h
+SOURCE=..\src\map\intif.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mail.c
+SOURCE=..\src\map\itemdb.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mail.h
+SOURCE=..\src\map\itemdb.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\map.c
+SOURCE=..\src\map\log.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\map.h
+SOURCE=..\src\map\log.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mapreg.h
+SOURCE=..\src\map\mail.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\mapreg_sql.c
+SOURCE=..\src\map\mail.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\homunculus.c
+SOURCE=..\src\map\map.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\homunculus.h
+SOURCE=..\src\map\map.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\instance.c
+SOURCE=..\src\map\mapreg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\map\instance.h
+SOURCE=..\src\map\mapreg_sql.c
 # End Source File
 # Begin Source File
 
@@ -471,6 +493,10 @@ SOURCE=..\src\map\unit.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\map\unit.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\map\vending.c
 # End Source File
 # Begin Source File