diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | vcproj-6/txt-converter-char.dsp | 12 | ||||
| -rw-r--r-- | vcproj-6/txt-converter-login.dsp | 12 |
3 files changed, 21 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 60939a692..4a4facb81 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2011/07/02 + * Fixed minor stuff in login/char converter VS6 project files (since r14858). [Ai4rei] * More instancing updates. [Ai4rei] - Improved instance_id validity checking. - Fixed instance name being copied with memcpy rather than safestrncpy (since r13901). diff --git a/vcproj-6/txt-converter-char.dsp b/vcproj-6/txt-converter-char.dsp index cb23fe4a9..0a6684e32 100644 --- a/vcproj-6/txt-converter-char.dsp +++ b/vcproj-6/txt-converter-char.dsp @@ -42,7 +42,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 /W3 /GX- /O2 /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /FD /c +# ADD CPP /nologo /W3 /O2 /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x405 /d "NDEBUG" # ADD RSC /l 0x417 /d "NDEBUG" @@ -67,7 +67,7 @@ LINK32=link.exe # 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 /GX- /ZI /Od /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /ZI /Od /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x405 /d "_DEBUG" # ADD RSC /l 0x417 /d "_DEBUG" @@ -113,6 +113,10 @@ SOURCE=..\src\common\ers.c # End Source File # Begin Source File +SOURCE=..\src\common\ers.h +# End Source File +# Begin Source File + SOURCE=..\src\common\lock.c # End Source File # Begin Source File @@ -169,6 +173,10 @@ SOURCE=..\src\common\timer.c # End Source File # Begin Source File +SOURCE=..\src\common\timer.h +# End Source File +# Begin Source File + SOURCE=..\src\common\utils.c # End Source File # Begin Source File diff --git a/vcproj-6/txt-converter-login.dsp b/vcproj-6/txt-converter-login.dsp index 27213b1b3..a5afb569a 100644 --- a/vcproj-6/txt-converter-login.dsp +++ b/vcproj-6/txt-converter-login.dsp @@ -42,7 +42,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 /W3 /GX- /O2 /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /D "WITH_SQL" /D "WITH_TXT" /FD /c +# ADD CPP /nologo /W3 /O2 /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /D "WITH_SQL" /D "WITH_TXT" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x405 /d "NDEBUG" # ADD RSC /l 0x417 /d "NDEBUG" @@ -67,7 +67,7 @@ LINK32=link.exe # 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 /GX- /ZI /Od /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /D "WITH_SQL" /D "WITH_TXT" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /ZI /Od /I "..\3rdparty\msinttypes\include" /I "..\3rdparty\mysql\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__WIN32" /D "DB_MANUAL_CAST_TO_UNION" /D "MINICORE" /D "TXT_SQL_CONVERT" /D "WITH_SQL" /D "WITH_TXT" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x405 /d "_DEBUG" # ADD RSC /l 0x417 /d "_DEBUG" @@ -113,6 +113,10 @@ SOURCE=..\src\common\ers.c # End Source File # Begin Source File +SOURCE=..\src\common\ers.h +# End Source File +# Begin Source File + SOURCE=..\src\common\lock.c # End Source File # Begin Source File @@ -157,6 +161,10 @@ SOURCE=..\src\common\timer.c # End Source File # Begin Source File +SOURCE=..\src\common\timer.h +# End Source File +# Begin Source File + SOURCE=..\src\common\utils.c # End Source File # Begin Source File |