diff options
author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-19 13:44:52 +0000 |
---|---|---|
committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-19 13:44:52 +0000 |
commit | 63b8c371c4640532cb877750599f706d9c2e9088 (patch) | |
tree | e9b9bb05e85e58f2f47c23d5d47f25da21446749 /vcproj-6/login-server_sql.dsp | |
parent | 9ff983f4f77c0da8a0a1cd4b88d13796184e7929 (diff) | |
download | hercules-63b8c371c4640532cb877750599f706d9c2e9088.tar.gz hercules-63b8c371c4640532cb877750599f706d9c2e9088.tar.bz2 hercules-63b8c371c4640532cb877750599f706d9c2e9088.tar.xz hercules-63b8c371c4640532cb877750599f706d9c2e9088.zip |
* 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
Diffstat (limited to 'vcproj-6/login-server_sql.dsp')
-rw-r--r-- | vcproj-6/login-server_sql.dsp | 62 |
1 files changed, 42 insertions, 20 deletions
diff --git a/vcproj-6/login-server_sql.dsp b/vcproj-6/login-server_sql.dsp index 0a52185e1..39bed2a9b 100644 --- a/vcproj-6/login-server_sql.dsp +++ b/vcproj-6/login-server_sql.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=login_sql - Win32 Release +CFG=login_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=login_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 "login-server_sql.mak" CFG="login_sql - Win32 Release" +!MESSAGE NMAKE /f "login-server_sql.mak" CFG="login_sql - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "login_sql - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "login_sql - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -26,6 +27,9 @@ CFG=login_sql - Win32 Release # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe + +!IF "$(CFG)" == "login_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\login_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\msinttypes\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_SQL" /Fp"tmp/login_sql/login-server_sql.pch" /YX /Fo"tmp/login_sql/" /Fd"tmp/login_sql/" /FD /c -# ADD BASE RSC /l 0x409 +# ADD CPP /nologo /W3 /Zi /O2 /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_SQL" /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 ws2_32.lib /nologo /subsystem:console /pdb:"tmp/login_sql/login-server_sql.pdb" /machine:I386 /out:"../login-server_sql.exe" /libpath:"..\3rdparty\mysql\lib" -# SUBTRACT LINK32 /pdb:none +# ADD LINK32 kernel32.lib ws2_32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\3rdparty\mysql\lib" + +!ELSEIF "$(CFG)" == "login_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\login_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\msinttypes\include" /I "..\3rdparty\mysql\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_SQL" /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 kernel32.lib ws2_32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\3rdparty\mysql\lib" + +!ENDIF + # Begin Target # Name "login_sql - Win32 Release" +# Name "login_sql - Win32 Debug" # Begin Group "common" # PROP Default_Filter "" @@ -83,14 +117,6 @@ SOURCE=..\src\common\ers.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 @@ -171,10 +197,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 |