diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | eAthena-6.dsw | 12 | ||||
| -rw-r--r-- | vcproj-6/char-server_txt.dsp | 137 | ||||
| -rw-r--r-- | vcproj-6/login-server_sql.dsp | 111 | ||||
| -rw-r--r-- | vcproj-6/login-server_txt.dsp | 118 | ||||
| -rw-r--r-- | vcproj-6/map-server_sql.dsp | 211 | ||||
| -rw-r--r-- | vcproj-6/map-server_txt.dsp | 221 |
7 files changed, 410 insertions, 401 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9a9f85a26..4f1bd5faa 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/02/01 + * Updated the old vs6 files to latest, thanks to k3dt for contributing them * Reorganized the vs6 project files (update will follow) * Fixed an accidental change in r9758 (edit&continue) [ultramage] * Added support for mob skill target 'randomtarget', when specified, it diff --git a/eAthena-6.dsw b/eAthena-6.dsw index ee77760fd..db1930d17 100644 --- a/eAthena-6.dsw +++ b/eAthena-6.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "char"=".\char\char.dsp" - Package Owner=<4>
+Project: "login_txt"=".\vcproj-6\login-server_txt.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4> ###############################################################################
-Project: "char_sql"=".\char_sql\char_sql.dsp" - Package Owner=<4>
+Project: "login_sql"=".\vcproj-6\login-server_sql.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -27,7 +27,7 @@ Package=<4> ###############################################################################
-Project: "login"=".\login\login.dsp" - Package Owner=<4>
+Project: "char_txt"=".\vcproj-6\char-server_txt.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -39,7 +39,7 @@ Package=<4> ###############################################################################
-Project: "login_sql"=".\login_sql\login_sql.dsp" - Package Owner=<4>
+Project: "char_sql"=".\vcproj-6\char-server_sql.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -51,7 +51,7 @@ Package=<4> ###############################################################################
-Project: "map"=".\map\map.dsp" - Package Owner=<4>
+Project: "map_txt"=".\vcproj-6\map-server_txt.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -63,7 +63,7 @@ Package=<4> ###############################################################################
-Project: "map_sql"=".\map_sql\map_sql.dsp" - Package Owner=<4>
+Project: "map_sql"=".\vcproj-6\map-server_sql.dsp" - Package Owner=<4>
Package=<5>
{{{
diff --git a/vcproj-6/char-server_txt.dsp b/vcproj-6/char-server_txt.dsp index a2d003967..cd6853cdd 100644 --- a/vcproj-6/char-server_txt.dsp +++ b/vcproj-6/char-server_txt.dsp @@ -1,23 +1,23 @@ -# Microsoft Developer Studio Project File - Name="char" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="char_txt" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=char - Win32 Release
+CFG=char_txt - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "char.mak".
+!MESSAGE NMAKE /f "char-server_txt.mak".
!MESSAGE
!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 "char.mak" CFG="char - Win32 Release"
+!MESSAGE NMAKE /f "char-server_txt.mak" CFG="char_txt - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "char - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "char_txt - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,148 +38,149 @@ 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 /W3 /GX /O2 /I "..\..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /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 BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
+# ADD RSC /l 0x405
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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib zdll.lib /nologo /subsystem:console /machine:I386 /out:"../../char.exe" /libpath:"../../lib"
+# ADD LINK32 wsock32.lib zdll.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/char-txt/char-server_txt.pdb" /machine:I386 /out:"../char-server_txt.exe" /libpath:"../lib"
+# SUBTRACT LINK32 /pdb:none
# Begin Target
-# Name "char - Win32 Release"
+# Name "char_txt - Win32 Release"
# Begin Group "common"
# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\common\cbasetypes.h
+SOURCE=..\src\common\cbasetypes.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\core.c
+SOURCE=..\src\common\core.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\core.h
+SOURCE=..\src\common\core.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\db.c
+SOURCE=..\src\common\db.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\db.h
+SOURCE=..\src\common\db.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\ers.c
+SOURCE=..\src\common\ers.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\ers.h
+SOURCE=..\src\common\ers.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\grfio.c
+SOURCE=..\src\common\grfio.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\grfio.h
+SOURCE=..\src\common\grfio.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\lock.c
+SOURCE=..\src\common\lock.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\lock.h
+SOURCE=..\src\common\lock.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\malloc.c
+SOURCE=..\src\common\malloc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\malloc.h
+SOURCE=..\src\common\malloc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mapindex.c
+SOURCE=..\src\common\mapindex.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mapindex.h
+SOURCE=..\src\common\mapindex.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mmo.h
+SOURCE=..\src\common\mmo.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\nullpo.c
+SOURCE=..\src\common\nullpo.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\nullpo.h
+SOURCE=..\src\common\nullpo.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugin.h
+SOURCE=..\src\common\plugin.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugins.c
+SOURCE=..\src\common\plugins.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugins.h
+SOURCE=..\src\common\plugins.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\showmsg.c
+SOURCE=..\src\common\showmsg.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\showmsg.h
+SOURCE=..\src\common\showmsg.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\socket.c
+SOURCE=..\src\common\socket.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\socket.h
+SOURCE=..\src\common\socket.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\strlib.c
+SOURCE=..\src\common\strlib.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\strlib.h
+SOURCE=..\src\common\strlib.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\timer.c
+SOURCE=..\src\common\timer.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\timer.h
+SOURCE=..\src\common\timer.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\utils.c
+SOURCE=..\src\common\utils.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\utils.h
+SOURCE=..\src\common\utils.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\version.h
+SOURCE=..\src\common\version.h
# End Source File
# End Group
# Begin Group "char"
@@ -187,59 +188,67 @@ SOURCE=..\..\src\common\version.h # PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\char\char.c
+SOURCE=..\src\char\char.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\char.h
+SOURCE=..\src\char\char.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\int_guild.c
+SOURCE=..\src\char\int_guild.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\int_guild.h
+SOURCE=..\src\char\int_guild.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\int_party.c
+SOURCE=..\src\char\int_homun.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\int_party.h
+SOURCE=..\src\char\int_homun.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\int_pet.c
+SOURCE=..\src\char\int_party.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\int_pet.h
+SOURCE=..\src\char\int_party.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\int_status.c
+SOURCE=..\src\char\int_pet.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\int_status.h
+SOURCE=..\src\char\int_pet.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\int_storage.c
+SOURCE=..\src\char\int_status.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\int_storage.h
+SOURCE=..\src\char\int_status.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\inter.c
+SOURCE=..\src\char\int_storage.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\char\inter.h
+SOURCE=..\src\char\int_storage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\inter.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char\inter.h
# End Source File
# End Group
# Begin Group "zlib"
@@ -247,39 +256,39 @@ SOURCE=..\..\src\char\inter.h # PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\zlib\crypt.h
+SOURCE=..\src\zlib\crypt.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\ioapi.c
+SOURCE=..\src\zlib\ioapi.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\ioapi.h
+SOURCE=..\src\zlib\ioapi.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\iowin32.c
+SOURCE=..\src\zlib\iowin32.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\iowin32.h
+SOURCE=..\src\zlib\iowin32.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\unzip.c
+SOURCE=..\src\zlib\unzip.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\unzip.h
+SOURCE=..\src\zlib\unzip.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\zconf.h
+SOURCE=..\src\zlib\zconf.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\zlib.h
+SOURCE=..\src\zlib\zlib.h
# End Source File
# End Group
# End Target
diff --git a/vcproj-6/login-server_sql.dsp b/vcproj-6/login-server_sql.dsp index d81ab9d87..5707bd80e 100644 --- a/vcproj-6/login-server_sql.dsp +++ b/vcproj-6/login-server_sql.dsp @@ -8,12 +8,12 @@ CFG=login_sql - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "login_sql.mak".
+!MESSAGE NMAKE /f "login-server_sql.mak".
!MESSAGE
!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 "login_sql.mak" CFG="login_sql - Win32 Release"
+!MESSAGE NMAKE /f "login-server_sql.mak" CFG="login_sql - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -38,15 +38,16 @@ 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 /W3 /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" /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 BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
+# ADD RSC /l 0x405
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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WSOCK32.lib zdll.lib libmysql.lib /nologo /subsystem:console /machine:I386 /out:"../../login-server_sql.exe" /libpath:"../../lib"
+# ADD LINK32 WSOCK32.lib libmysql.lib zdll.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/login_sql/login-server_sql.pdb" /machine:I386 /out:"../login-server_sql.exe" /libpath:"../lib"
+# SUBTRACT LINK32 /pdb:none
# Begin Target
# Name "login_sql - Win32 Release"
@@ -55,155 +56,155 @@ LINK32=link.exe # PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\common\cbasetypes.h
+SOURCE=..\src\common\cbasetypes.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\core.c
+SOURCE=..\src\common\core.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\core.h
+SOURCE=..\src\common\core.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\db.c
+SOURCE=..\src\common\db.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\db.h
+SOURCE=..\src\common\db.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\ers.c
+SOURCE=..\src\common\ers.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\ers.h
+SOURCE=..\src\common\ers.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\grfio.c
+SOURCE=..\src\common\grfio.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\grfio.h
+SOURCE=..\src\common\grfio.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\lock.c
+SOURCE=..\src\common\lock.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\lock.h
+SOURCE=..\src\common\lock.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\malloc.c
+SOURCE=..\src\common\malloc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\malloc.h
+SOURCE=..\src\common\malloc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mapindex.c
+SOURCE=..\src\common\mapindex.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mapindex.h
+SOURCE=..\src\common\mapindex.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mmo.h
+SOURCE=..\src\common\md5calc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\nullpo.c
+SOURCE=..\src\common\md5calc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\nullpo.h
+SOURCE=..\src\common\mmo.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugin.h
+SOURCE=..\src\common\nullpo.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugins.c
+SOURCE=..\src\common\nullpo.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugins.h
+SOURCE=..\src\common\plugin.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\showmsg.c
+SOURCE=..\src\common\plugins.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\showmsg.h
+SOURCE=..\src\common\plugins.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\socket.c
+SOURCE=..\src\common\showmsg.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\socket.h
+SOURCE=..\src\common\showmsg.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\strlib.c
+SOURCE=..\src\common\socket.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\strlib.h
+SOURCE=..\src\common\socket.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\svnversion.h
+SOURCE=..\src\common\strlib.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\timer.c
+SOURCE=..\src\common\strlib.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\timer.h
+SOURCE=..\src\common\svnversion.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\utils.c
+SOURCE=..\src\common\timer.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\utils.h
+SOURCE=..\src\common\timer.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\version.h
+SOURCE=..\src\common\utils.c
# End Source File
-# End Group
-# Begin Group "login_sql"
-
-# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\login_sql\login.c
+SOURCE=..\src\common\utils.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\login_sql\login.h
+SOURCE=..\src\common\version.h
# End Source File
+# End Group
+# Begin Group "login_sql"
+
+# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\login_sql\md5calc.c
+SOURCE=..\src\login_sql\login.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\login_sql\md5calc.h
+SOURCE=..\src\login_sql\login.h
# End Source File
# End Group
# Begin Group "zlib"
@@ -211,39 +212,39 @@ SOURCE=..\..\src\login_sql\md5calc.h # PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\zlib\crypt.h
+SOURCE=..\src\zlib\crypt.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\ioapi.c
+SOURCE=..\src\zlib\ioapi.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\ioapi.h
+SOURCE=..\src\zlib\ioapi.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\iowin32.c
+SOURCE=..\src\zlib\iowin32.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\iowin32.h
+SOURCE=..\src\zlib\iowin32.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\unzip.c
+SOURCE=..\src\zlib\unzip.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\unzip.h
+SOURCE=..\src\zlib\unzip.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\zconf.h
+SOURCE=..\src\zlib\zconf.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\zlib.h
+SOURCE=..\src\zlib\zlib.h
# End Source File
# End Group
# End Target
diff --git a/vcproj-6/login-server_txt.dsp b/vcproj-6/login-server_txt.dsp index db027fc41..821fbc27a 100644 --- a/vcproj-6/login-server_txt.dsp +++ b/vcproj-6/login-server_txt.dsp @@ -1,23 +1,23 @@ -# Microsoft Developer Studio Project File - Name="login" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="login_txt" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=login - Win32 Release
+CFG=login_txt - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "login.mak".
+!MESSAGE NMAKE /f "login-server_txt.mak".
!MESSAGE
!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 "login.mak" CFG="login - Win32 Release"
+!MESSAGE NMAKE /f "login-server_txt.mak" CFG="login_txt - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "login - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "login_txt - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,173 +38,169 @@ 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 /W3 /GX /O2 /I "..\..\src\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /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 BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
+# ADD RSC /l 0x405
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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WSOCK32.lib zdll.lib /nologo /subsystem:console /machine:I386 /out:"../../login-server.exe" /libpath:"../../lib"
+# ADD LINK32 WSOCK32.lib zdll.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/login_txt/login-server_txt.pdb" /machine:I386 /out:"../login-server_txt.exe" /libpath:"../lib"
# SUBTRACT LINK32 /pdb:none
# Begin Target
-# Name "login - Win32 Release"
+# Name "login_txt - Win32 Release"
# Begin Group "common"
# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\common\cbasetypes.h
+SOURCE=..\src\common\cbasetypes.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\core.c
+SOURCE=..\src\common\core.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\core.h
+SOURCE=..\src\common\core.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\db.c
+SOURCE=..\src\common\db.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\db.h
+SOURCE=..\src\common\db.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\ers.c
+SOURCE=..\src\common\ers.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\ers.h
+SOURCE=..\src\common\ers.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\grfio.c
+SOURCE=..\src\common\grfio.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\grfio.h
+SOURCE=..\src\common\grfio.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\lock.c
+SOURCE=..\src\common\lock.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\lock.h
+SOURCE=..\src\common\lock.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\malloc.c
+SOURCE=..\src\common\malloc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\malloc.h
+SOURCE=..\src\common\malloc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mapindex.c
+SOURCE=..\src\common\mapindex.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mapindex.h
+SOURCE=..\src\common\mapindex.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mmo.h
+SOURCE=..\src\common\md5calc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\nullpo.c
+SOURCE=..\src\common\mmo.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\nullpo.h
+SOURCE=..\src\common\nullpo.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugin.h
+SOURCE=..\src\common\nullpo.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugins.c
+SOURCE=..\src\common\plugin.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugins.h
+SOURCE=..\src\common\plugins.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\showmsg.c
+SOURCE=..\src\common\plugins.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\showmsg.h
+SOURCE=..\src\common\showmsg.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\socket.c
+SOURCE=..\src\common\showmsg.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\socket.h
+SOURCE=..\src\common\socket.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\strlib.c
+SOURCE=..\src\common\socket.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\strlib.h
+SOURCE=..\src\common\strlib.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\svnversion.h
+SOURCE=..\src\common\strlib.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\timer.c
+SOURCE=..\src\common\svnversion.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\timer.h
+SOURCE=..\src\common\timer.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\utils.c
+SOURCE=..\src\common\timer.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\utils.h
+SOURCE=..\src\common\utils.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\version.h
+SOURCE=..\src\common\utils.h
# End Source File
-# End Group
-# Begin Group "login"
-
-# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\login\login.c
+SOURCE=..\src\common\version.h
# End Source File
-# Begin Source File
+# End Group
+# Begin Group "login"
-SOURCE=..\..\src\login\login.h
-# End Source File
+# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\login\md5calc.c
+SOURCE=..\src\login\login.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\login\md5calc.h
+SOURCE=..\src\login\login.h
# End Source File
# End Group
# Begin Group "zlib"
@@ -212,39 +208,39 @@ SOURCE=..\..\src\login\md5calc.h # PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\zlib\crypt.h
+SOURCE=..\src\zlib\crypt.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\ioapi.c
+SOURCE=..\src\zlib\ioapi.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\ioapi.h
+SOURCE=..\src\zlib\ioapi.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\iowin32.c
+SOURCE=..\src\zlib\iowin32.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\iowin32.h
+SOURCE=..\src\zlib\iowin32.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\unzip.c
+SOURCE=..\src\zlib\unzip.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\unzip.h
+SOURCE=..\src\zlib\unzip.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\zconf.h
+SOURCE=..\src\zlib\zconf.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\zlib.h
+SOURCE=..\src\zlib\zlib.h
# End Source File
# End Group
# End Target
diff --git a/vcproj-6/map-server_sql.dsp b/vcproj-6/map-server_sql.dsp index 4b540bee9..a1c375790 100644 --- a/vcproj-6/map-server_sql.dsp +++ b/vcproj-6/map-server_sql.dsp @@ -8,12 +8,12 @@ CFG=map_sql - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "map_sql.mak".
+!MESSAGE NMAKE /f "map-server_sql.mak".
!MESSAGE
!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_sql.mak" CFG="map_sql - Win32 Release"
+!MESSAGE NMAKE /f "map-server_sql.mak" CFG="map_sql - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -38,15 +38,16 @@ 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 /W3 /GX /O2 /I "..\..\src\common" /I "..\..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /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 BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
+# ADD RSC /l 0x405
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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WSOCK32.lib zdll.lib libmysql.lib pcre.lib /nologo /subsystem:console /machine:I386 /out:"../../map-server_sql.exe" /libpath:"../../lib"
+# ADD LINK32 WSOCK32.lib libmysql.lib pcre.lib zdll.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/map_sql/map-server_sql.pdb" /machine:I386 /out:"../map-server_sql.exe" /libpath:"../lib"
+# SUBTRACT LINK32 /pdb:none
# Begin Target
# Name "map_sql - Win32 Release"
@@ -55,135 +56,135 @@ LINK32=link.exe # PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\common\cbasetypes.h
+SOURCE=..\src\common\cbasetypes.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\core.c
+SOURCE=..\src\common\core.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\core.h
+SOURCE=..\src\common\core.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\db.c
+SOURCE=..\src\common\db.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\db.h
+SOURCE=..\src\common\db.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\ers.c
+SOURCE=..\src\common\ers.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\ers.h
+SOURCE=..\src\common\ers.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\grfio.c
+SOURCE=..\src\common\grfio.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\grfio.h
+SOURCE=..\src\common\grfio.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\lock.c
+SOURCE=..\src\common\lock.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\lock.h
+SOURCE=..\src\common\lock.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\malloc.c
+SOURCE=..\src\common\malloc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\malloc.h
+SOURCE=..\src\common\malloc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mapindex.c
+SOURCE=..\src\common\mapindex.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mapindex.h
+SOURCE=..\src\common\mapindex.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mmo.h
+SOURCE=..\src\common\mmo.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\nullpo.c
+SOURCE=..\src\common\nullpo.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\nullpo.h
+SOURCE=..\src\common\nullpo.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugin.h
+SOURCE=..\src\common\plugin.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugins.c
+SOURCE=..\src\common\plugins.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugins.h
+SOURCE=..\src\common\plugins.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\showmsg.c
+SOURCE=..\src\common\showmsg.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\showmsg.h
+SOURCE=..\src\common\showmsg.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\socket.c
+SOURCE=..\src\common\socket.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\socket.h
+SOURCE=..\src\common\socket.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\strlib.c
+SOURCE=..\src\common\strlib.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\strlib.h
+SOURCE=..\src\common\strlib.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\svnversion.h
+SOURCE=..\src\common\svnversion.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\timer.c
+SOURCE=..\src\common\timer.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\timer.h
+SOURCE=..\src\common\timer.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\utils.c
+SOURCE=..\src\common\utils.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\utils.h
+SOURCE=..\src\common\utils.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\version.h
+SOURCE=..\src\common\version.h
# End Source File
# End Group
# Begin Group "map"
@@ -191,235 +192,235 @@ SOURCE=..\..\src\common\version.h # PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\map\atcommand.c
+SOURCE=..\src\map\atcommand.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\atcommand.h
+SOURCE=..\src\map\atcommand.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\battle.c
+SOURCE=..\src\map\battle.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\battle.h
+SOURCE=..\src\map\battle.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\charcommand.c
+SOURCE=..\src\map\charcommand.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\charcommand.h
+SOURCE=..\src\map\charcommand.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\charsave.c
+SOURCE=..\src\map\charsave.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\charsave.h
+SOURCE=..\src\map\charsave.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\chat.c
+SOURCE=..\src\map\chat.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\chat.h
+SOURCE=..\src\map\chat.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\chrif.c
+SOURCE=..\src\map\chrif.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\chrif.h
+SOURCE=..\src\map\chrif.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\clif.c
+SOURCE=..\src\map\clif.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\clif.h
+SOURCE=..\src\map\clif.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\date.c
+SOURCE=..\src\map\date.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\date.h
+SOURCE=..\src\map\date.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\guild.c
+SOURCE=..\src\map\guild.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\guild.h
+SOURCE=..\src\map\guild.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\intif.c
+SOURCE=..\src\map\intif.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\intif.h
+SOURCE=..\src\map\intif.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\irc.c
+SOURCE=..\src\map\irc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\irc.h
+SOURCE=..\src\map\irc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\itemdb.c
+SOURCE=..\src\map\itemdb.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\itemdb.h
+SOURCE=..\src\map\itemdb.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\log.c
+SOURCE=..\src\map\log.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\log.h
+SOURCE=..\src\map\log.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mail.c
+SOURCE=..\src\map\mail.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mail.h
+SOURCE=..\src\map\mail.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\map.c
+SOURCE=..\src\map\map.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\map.h
+SOURCE=..\src\map\map.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mercenary.c
+SOURCE=..\src\map\mercenary.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mercenary.h
+SOURCE=..\src\map\mercenary.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mob.c
+SOURCE=..\src\map\mob.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mob.h
+SOURCE=..\src\map\mob.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\npc.c
+SOURCE=..\src\map\npc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\npc.h
+SOURCE=..\src\map\npc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\npc_chat.c
+SOURCE=..\src\map\npc_chat.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\party.c
+SOURCE=..\src\map\party.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\party.h
+SOURCE=..\src\map\party.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\path.c
+SOURCE=..\src\map\path.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\pc.c
+SOURCE=..\src\map\pc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\pc.h
+SOURCE=..\src\map\pc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\pcre.h
+SOURCE=..\src\map\pcre.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\pet.c
+SOURCE=..\src\map\pet.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\pet.h
+SOURCE=..\src\map\pet.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\script.c
+SOURCE=..\src\map\script.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\script.h
+SOURCE=..\src\map\script.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\skill.c
+SOURCE=..\src\map\skill.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\skill.h
+SOURCE=..\src\map\skill.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\status.c
+SOURCE=..\src\map\status.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\status.h
+SOURCE=..\src\map\status.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\storage.c
+SOURCE=..\src\map\storage.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\storage.h
+SOURCE=..\src\map\storage.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\trade.c
+SOURCE=..\src\map\trade.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\trade.h
+SOURCE=..\src\map\trade.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\unit.c
+SOURCE=..\src\map\unit.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\vending.c
+SOURCE=..\src\map\vending.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\vending.h
+SOURCE=..\src\map\vending.h
# End Source File
# End Group
# Begin Group "zlib"
@@ -427,39 +428,39 @@ SOURCE=..\..\src\map\vending.h # PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\zlib\crypt.h
+SOURCE=..\src\zlib\crypt.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\ioapi.c
+SOURCE=..\src\zlib\ioapi.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\ioapi.h
+SOURCE=..\src\zlib\ioapi.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\iowin32.c
+SOURCE=..\src\zlib\iowin32.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\iowin32.h
+SOURCE=..\src\zlib\iowin32.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\unzip.c
+SOURCE=..\src\zlib\unzip.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\unzip.h
+SOURCE=..\src\zlib\unzip.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\zconf.h
+SOURCE=..\src\zlib\zconf.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\zlib.h
+SOURCE=..\src\zlib\zlib.h
# End Source File
# End Group
# End Target
diff --git a/vcproj-6/map-server_txt.dsp b/vcproj-6/map-server_txt.dsp index 8f1fb5c2d..e77b8a2b3 100644 --- a/vcproj-6/map-server_txt.dsp +++ b/vcproj-6/map-server_txt.dsp @@ -1,23 +1,23 @@ -# Microsoft Developer Studio Project File - Name="map" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="map_txt" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=map - Win32 Release
+CFG=map_txt - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "map.mak".
+!MESSAGE NMAKE /f "map-server_txt.mak".
!MESSAGE
!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.mak" CFG="map - Win32 Release"
+!MESSAGE NMAKE /f "map-server_txt.mak" CFG="map_txt - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "map - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "map_txt - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -38,152 +38,153 @@ 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 /W3 /GX /O2 /I "..\..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /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 BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
+# ADD RSC /l 0x405
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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WSOCK32.lib zdll.lib pcre.lib /nologo /subsystem:console /machine:I386 /out:"../../map-server.exe" /libpath:"../../lib"
+# ADD LINK32 WSOCK32.lib pcre.lib zdll.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/map_txt/map-server_txt.pdb" /machine:I386 /out:"../map-server_txt.exe" /libpath:"../lib"
+# SUBTRACT LINK32 /pdb:none
# Begin Target
-# Name "map - Win32 Release"
+# Name "map_txt - Win32 Release"
# Begin Group "common"
# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\common\cbasetypes.h
+SOURCE=..\src\common\cbasetypes.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\core.c
+SOURCE=..\src\common\core.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\core.h
+SOURCE=..\src\common\core.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\db.c
+SOURCE=..\src\common\db.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\db.h
+SOURCE=..\src\common\db.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\ers.c
+SOURCE=..\src\common\ers.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\ers.h
+SOURCE=..\src\common\ers.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\grfio.c
+SOURCE=..\src\common\grfio.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\grfio.h
+SOURCE=..\src\common\grfio.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\lock.c
+SOURCE=..\src\common\lock.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\lock.h
+SOURCE=..\src\common\lock.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\malloc.c
+SOURCE=..\src\common\malloc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\malloc.h
+SOURCE=..\src\common\malloc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mapindex.c
+SOURCE=..\src\common\mapindex.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mapindex.h
+SOURCE=..\src\common\mapindex.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\mmo.h
+SOURCE=..\src\common\mmo.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\nullpo.c
+SOURCE=..\src\common\nullpo.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\nullpo.h
+SOURCE=..\src\common\nullpo.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugin.h
+SOURCE=..\src\common\plugin.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugins.c
+SOURCE=..\src\common\plugins.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\plugins.h
+SOURCE=..\src\common\plugins.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\showmsg.c
+SOURCE=..\src\common\showmsg.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\showmsg.h
+SOURCE=..\src\common\showmsg.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\socket.c
+SOURCE=..\src\common\socket.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\socket.h
+SOURCE=..\src\common\socket.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\strlib.c
+SOURCE=..\src\common\strlib.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\strlib.h
+SOURCE=..\src\common\strlib.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\svnversion.h
+SOURCE=..\src\common\svnversion.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\timer.c
+SOURCE=..\src\common\timer.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\timer.h
+SOURCE=..\src\common\timer.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\utils.c
+SOURCE=..\src\common\utils.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\utils.h
+SOURCE=..\src\common\utils.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\common\version.h
+SOURCE=..\src\common\version.h
# End Source File
# End Group
# Begin Group "map"
@@ -194,123 +195,123 @@ SOURCE=..\..\src\common\version.h # PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\map\atcommand.c
+SOURCE=..\src\map\atcommand.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\battle.c
+SOURCE=..\src\map\battle.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\charcommand.c
+SOURCE=..\src\map\charcommand.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\charsave.c
+SOURCE=..\src\map\charsave.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\chat.c
+SOURCE=..\src\map\chat.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\chrif.c
+SOURCE=..\src\map\chrif.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\clif.c
+SOURCE=..\src\map\clif.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\date.c
+SOURCE=..\src\map\date.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\guild.c
+SOURCE=..\src\map\guild.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\intif.c
+SOURCE=..\src\map\intif.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\irc.c
+SOURCE=..\src\map\irc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\itemdb.c
+SOURCE=..\src\map\itemdb.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\log.c
+SOURCE=..\src\map\log.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mail.c
+SOURCE=..\src\map\mail.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\map.c
+SOURCE=..\src\map\map.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mercenary.c
+SOURCE=..\src\map\mercenary.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mob.c
+SOURCE=..\src\map\mob.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\npc.c
+SOURCE=..\src\map\npc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\npc_chat.c
+SOURCE=..\src\map\npc_chat.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\party.c
+SOURCE=..\src\map\party.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\path.c
+SOURCE=..\src\map\path.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\pc.c
+SOURCE=..\src\map\pc.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\pet.c
+SOURCE=..\src\map\pet.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\script.c
+SOURCE=..\src\map\script.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\skill.c
+SOURCE=..\src\map\skill.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\status.c
+SOURCE=..\src\map\status.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\storage.c
+SOURCE=..\src\map\storage.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\trade.c
+SOURCE=..\src\map\trade.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\unit.c
+SOURCE=..\src\map\unit.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\vending.c
+SOURCE=..\src\map\vending.c
# End Source File
# End Group
# Begin Group "h"
@@ -318,119 +319,119 @@ SOURCE=..\..\src\map\vending.c # PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\map\atcommand.h
+SOURCE=..\src\map\atcommand.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\battle.h
+SOURCE=..\src\map\battle.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\charcommand.h
+SOURCE=..\src\map\charcommand.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\charsave.h
+SOURCE=..\src\map\charsave.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\chat.h
+SOURCE=..\src\map\chat.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\chrif.h
+SOURCE=..\src\map\chrif.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\clif.h
+SOURCE=..\src\map\clif.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\date.h
+SOURCE=..\src\map\date.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\guild.h
+SOURCE=..\src\map\guild.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\intif.h
+SOURCE=..\src\map\intif.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\irc.h
+SOURCE=..\src\map\irc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\itemdb.h
+SOURCE=..\src\map\itemdb.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\log.h
+SOURCE=..\src\map\log.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mail.h
+SOURCE=..\src\map\mail.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\map.h
+SOURCE=..\src\map\map.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mercenary.h
+SOURCE=..\src\map\mercenary.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\mob.h
+SOURCE=..\src\map\mob.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\npc.h
+SOURCE=..\src\map\npc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\party.h
+SOURCE=..\src\map\party.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\pc.h
+SOURCE=..\src\map\pc.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\pcre.h
+SOURCE=..\src\map\pcre.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\pet.h
+SOURCE=..\src\map\pet.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\script.h
+SOURCE=..\src\map\script.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\skill.h
+SOURCE=..\src\map\skill.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\status.h
+SOURCE=..\src\map\status.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\storage.h
+SOURCE=..\src\map\storage.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\trade.h
+SOURCE=..\src\map\trade.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\unit.h
+SOURCE=..\src\map\unit.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\map\vending.h
+SOURCE=..\src\map\vending.h
# End Source File
# End Group
# End Group
@@ -439,39 +440,39 @@ SOURCE=..\..\src\map\vending.h # PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\src\zlib\crypt.h
+SOURCE=..\src\zlib\crypt.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\ioapi.c
+SOURCE=..\src\zlib\ioapi.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\ioapi.h
+SOURCE=..\src\zlib\ioapi.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\iowin32.c
+SOURCE=..\src\zlib\iowin32.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\iowin32.h
+SOURCE=..\src\zlib\iowin32.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\unzip.c
+SOURCE=..\src\zlib\unzip.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\unzip.h
+SOURCE=..\src\zlib\unzip.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\zconf.h
+SOURCE=..\src\zlib\zconf.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\zlib\zlib.h
+SOURCE=..\src\zlib\zlib.h
# End Source File
# End Group
# End Target
|