summaryrefslogtreecommitdiff
path: root/vcproj-9
diff options
context:
space:
mode:
Diffstat (limited to 'vcproj-9')
-rw-r--r--vcproj-9/char-server_sql.vcproj14
-rw-r--r--vcproj-9/char-server_txt.vcproj12
-rw-r--r--vcproj-9/ladmin.vcproj8
-rw-r--r--vcproj-9/login-server_sql.vcproj48
-rw-r--r--vcproj-9/login-server_txt.vcproj38
-rw-r--r--vcproj-9/map-server_sql.vcproj26
-rw-r--r--vcproj-9/map-server_txt.vcproj24
-rw-r--r--vcproj-9/mapcache.vcproj18
-rw-r--r--vcproj-9/txt-converter-char.vcproj20
-rw-r--r--vcproj-9/txt-converter-login.vcproj40
10 files changed, 145 insertions, 103 deletions
diff --git a/vcproj-9/char-server_sql.vcproj b/vcproj-9/char-server_sql.vcproj
index 2e42ab8b5..03e510340 100644
--- a/vcproj-9/char-server_sql.vcproj
+++ b/vcproj-9/char-server_sql.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9.00"
+ Version="9,00"
Name="char-server_sql"
ProjectGUID="{D356871D-58E1-450B-967A-E4E9646175AF}"
RootNamespace="char-server_sql"
@@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
+ AdditionalIncludeDirectories="..\3rdparty\mysql\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
@@ -68,10 +68,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
+ AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\mysql\lib"
IgnoreAllDefaultLibraries="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -136,7 +136,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
+ AdditionalIncludeDirectories="..\3rdparty\mysql\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
StringPooling="true"
RuntimeLibrary="0"
@@ -158,10 +158,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
+ AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\mysql\lib"
IgnoreAllDefaultLibraries="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
diff --git a/vcproj-9/char-server_txt.vcproj b/vcproj-9/char-server_txt.vcproj
index d4f212564..517b985fc 100644
--- a/vcproj-9/char-server_txt.vcproj
+++ b/vcproj-9/char-server_txt.vcproj
@@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
@@ -68,10 +68,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib zdll.lib"
+ AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib"
OutputFile="$(OutDir)\char-server.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories=""
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\char-server.pdb"
@@ -135,7 +135,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
StringPooling="true"
RuntimeLibrary="0"
@@ -157,10 +157,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib zdll.lib"
+ AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib"
OutputFile="$(OutDir)\char-server.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories=""
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\char-server.pdb"
diff --git a/vcproj-9/ladmin.vcproj b/vcproj-9/ladmin.vcproj
index a734da38a..e12d86e53 100644
--- a/vcproj-9/ladmin.vcproj
+++ b/vcproj-9/ladmin.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\src\common"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;MINICORE;FD_SETSIZE=4096"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
@@ -70,7 +70,7 @@
AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib"
OutputFile="$(OutDir)\ladmin.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories=""
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
@@ -133,7 +133,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\src\common"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;MINICORE;FD_SETSIZE=4096"
StringPooling="true"
RuntimeLibrary="0"
@@ -158,7 +158,7 @@
AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib"
OutputFile="$(OutDir)\ladmin.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories=""
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
diff --git a/vcproj-9/login-server_sql.vcproj b/vcproj-9/login-server_sql.vcproj
index 80cbd73c5..d0f8f3eaf 100644
--- a/vcproj-9/login-server_sql.vcproj
+++ b/vcproj-9/login-server_sql.vcproj
@@ -42,8 +42,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
- PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
+ AdditionalIncludeDirectories="..\3rdparty\mysql\include"
+ PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_SQL"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
ExceptionHandling="0"
@@ -68,10 +68,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
+ AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\mysql\lib"
IgnoreAllDefaultLibraries="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -136,8 +136,8 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
- PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
+ AdditionalIncludeDirectories="..\3rdparty\mysql\include"
+ PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_SQL"
StringPooling="true"
RuntimeLibrary="0"
DefaultCharIsUnsigned="false"
@@ -160,10 +160,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
+ AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\mysql\lib"
IgnoreAllDefaultLibraries="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -206,11 +206,39 @@
Name="login_sql"
>
<File
- RelativePath="..\src\login_sql\login.c"
+ RelativePath="..\src\login\account.h"
>
</File>
<File
- RelativePath="..\src\login_sql\login.h"
+ RelativePath="..\src\login\account_sql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\admin.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\ipban.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\ipban_sql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\login.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\login.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\loginlog.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\loginlog_sql.c"
>
</File>
</Filter>
diff --git a/vcproj-9/login-server_txt.vcproj b/vcproj-9/login-server_txt.vcproj
index 78cc1d041..e5897aaaa 100644
--- a/vcproj-9/login-server_txt.vcproj
+++ b/vcproj-9/login-server_txt.vcproj
@@ -41,8 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib"
- PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
+ PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
ExceptionHandling="0"
@@ -67,11 +66,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib zdll.lib"
+ AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib"
ShowProgress="0"
OutputFile="$(OutDir)\login-server.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories=""
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\login-server.pdb"
@@ -134,8 +133,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib"
- PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
+ PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT"
StringPooling="true"
RuntimeLibrary="0"
DefaultCharIsUnsigned="false"
@@ -156,10 +154,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib zdll.lib"
+ AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib"
OutputFile="$(OutDir)\login-server.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories=""
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\login-server.pdb"
@@ -201,10 +199,26 @@
Name="login_txt"
>
<File
+ RelativePath="..\src\login\account.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\account_txt.c"
+ >
+ </File>
+ <File
RelativePath="..\src\login\admin.c"
>
</File>
<File
+ RelativePath="..\src\login\ipban.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\ipban_txt.c"
+ >
+ </File>
+ <File
RelativePath="..\src\login\login.c"
>
</File>
@@ -212,6 +226,14 @@
RelativePath="..\src\login\login.h"
>
</File>
+ <File
+ RelativePath="..\src\login\loginlog.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\loginlog_txt.c"
+ >
+ </File>
</Filter>
<Filter
Name="common"
diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj
index 19f4d57e8..d0d7cfe22 100644
--- a/vcproj-9/map-server_sql.vcproj
+++ b/vcproj-9/map-server_sql.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9.00"
+ Version="9,00"
Name="map-server_sql"
ProjectGUID="{D356871D-58E1-450B-967A-E6E9646175AF}"
RootNamespace="map-server_sql"
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
+ AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;MAPREGSQL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
@@ -70,7 +70,7 @@
AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib pcre.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib"
IgnoreAllDefaultLibraries="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -135,7 +135,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
+ AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;MAPREGSQL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
StringPooling="true"
RuntimeLibrary="0"
@@ -160,7 +160,7 @@
AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib pcre.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib"
IgnoreAllDefaultLibraries="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -340,18 +340,6 @@
</File>
</Filter>
<Filter
- Name="zlib"
- >
- <File
- RelativePath="..\src\zlib\zconf.h"
- >
- </File>
- <File
- RelativePath="..\src\zlib\zlib.h"
- >
- </File>
- </Filter>
- <Filter
Name="map_sql"
>
<File
@@ -519,10 +507,6 @@
>
</File>
<File
- RelativePath="..\src\map\pcre.h"
- >
- </File>
- <File
RelativePath="..\src\map\pet.c"
>
</File>
diff --git a/vcproj-9/map-server_txt.vcproj b/vcproj-9/map-server_txt.vcproj
index 5b3872dc0..779ff5f25 100644
--- a/vcproj-9/map-server_txt.vcproj
+++ b/vcproj-9/map-server_txt.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib"
+ AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\pcre\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
@@ -71,7 +71,7 @@
AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib zdll.lib pcre.lib"
OutputFile="$(OutDir)\map-server.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\zlib\lib;..\3rdparty\pcre\lib"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\map-server.pdb"
@@ -134,7 +134,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib"
+ AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\pcre\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
StringPooling="true"
RuntimeLibrary="0"
@@ -160,7 +160,7 @@
AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib zdll.lib pcre.lib"
OutputFile="$(OutDir)\map-server.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\zlib\lib;..\3rdparty\pcre\lib"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\map-server.pdb"
@@ -366,10 +366,6 @@
>
</File>
<File
- RelativePath="..\src\map\pcre.h"
- >
- </File>
- <File
RelativePath="..\src\map\pet.c"
>
</File>
@@ -443,18 +439,6 @@
</File>
</Filter>
<Filter
- Name="zlib"
- >
- <File
- RelativePath="..\src\zlib\zconf.h"
- >
- </File>
- <File
- RelativePath="..\src\zlib\zlib.h"
- >
- </File>
- </Filter>
- <Filter
Name="common"
>
<File
diff --git a/vcproj-9/mapcache.vcproj b/vcproj-9/mapcache.vcproj
index 113611965..29c07715c 100644
--- a/vcproj-9/mapcache.vcproj
+++ b/vcproj-9/mapcache.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib"
+ AdditionalIncludeDirectories="..\3rdparty\zlib\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
@@ -70,7 +70,7 @@
AdditionalDependencies="libcmtd.lib oldnames.lib zdll.lib"
OutputFile="$(OutDir)\mapcache.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\zlib\lib"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
@@ -133,7 +133,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib"
+ AdditionalIncludeDirectories="..\include\zlib"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
@@ -212,18 +212,6 @@
>
</File>
</Filter>
- <Filter
- Name="zlib"
- >
- <File
- RelativePath="..\src\zlib\zconf.h"
- >
- </File>
- <File
- RelativePath="..\src\zlib\zlib.h"
- >
- </File>
- </Filter>
</Files>
<Globals>
</Globals>
diff --git a/vcproj-9/txt-converter-char.vcproj b/vcproj-9/txt-converter-char.vcproj
index 97debfe11..31a48cc8b 100644
--- a/vcproj-9/txt-converter-char.vcproj
+++ b/vcproj-9/txt-converter-char.vcproj
@@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
+ AdditionalIncludeDirectories="..\3rdparty\mysql\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;MINICORE;TXT_SQL_CONVERT"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
@@ -67,10 +67,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
+ AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib"
OutputFile="$(OutDir)\char-converter.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\mysql\lib"
IgnoreAllDefaultLibraries="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -135,7 +135,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
+ AdditionalIncludeDirectories="..\3rdparty\mysql\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;MINICORE;TXT_SQL_CONVERT"
StringPooling="true"
RuntimeLibrary="0"
@@ -158,10 +158,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
+ AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib"
OutputFile="$(OutDir)\char-converter.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\mysql\lib"
IgnoreAllDefaultLibraries="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -312,6 +312,14 @@
>
</File>
<File
+ RelativePath="..\src\common\timer.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\common\timer.h"
+ >
+ </File>
+ <File
RelativePath="..\src\common\utils.c"
>
</File>
diff --git a/vcproj-9/txt-converter-login.vcproj b/vcproj-9/txt-converter-login.vcproj
index 2b2097e11..124d35715 100644
--- a/vcproj-9/txt-converter-login.vcproj
+++ b/vcproj-9/txt-converter-login.vcproj
@@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
+ AdditionalIncludeDirectories="..\3rdparty\mysql\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;MINICORE;TXT_SQL_CONVERT"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
@@ -67,10 +67,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
+ AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib"
OutputFile="$(OutDir)\login-converter.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\mysql\lib"
IgnoreAllDefaultLibraries="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -135,7 +135,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
+ AdditionalIncludeDirectories="..\3rdparty\mysql\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;MINICORE;TXT_SQL_CONVERT"
StringPooling="true"
RuntimeLibrary="0"
@@ -158,10 +158,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib"
+ AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib"
OutputFile="$(OutDir)\login-converter.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\mysql\lib"
IgnoreAllDefaultLibraries="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -228,6 +228,14 @@
>
</File>
<File
+ RelativePath="..\src\common\lock.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\common\lock.h"
+ >
+ </File>
+ <File
RelativePath="..\src\common\malloc.c"
>
</File>
@@ -259,8 +267,28 @@
RelativePath="..\src\common\strlib.h"
>
</File>
+ <File
+ RelativePath="..\src\common\timer.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\common\timer.h"
+ >
+ </File>
</Filter>
<File
+ RelativePath="..\src\login\account.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\account_sql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\account_txt.c"
+ >
+ </File>
+ <File
RelativePath="..\src\txt-converter\login-converter.c"
>
</File>