summaryrefslogtreecommitdiff
path: root/vcproj-8
diff options
context:
space:
mode:
Diffstat (limited to 'vcproj-8')
-rw-r--r--vcproj-8/char-server_sql.vcproj20
-rw-r--r--vcproj-8/char-server_txt.vcproj12
-rw-r--r--vcproj-8/ladmin.vcproj8
-rw-r--r--vcproj-8/login-server_sql.vcproj48
-rw-r--r--vcproj-8/login-server_txt.vcproj42
-rw-r--r--vcproj-8/map-server_sql.vcproj38
-rw-r--r--vcproj-8/map-server_txt.vcproj38
-rw-r--r--vcproj-8/mapcache.vcproj20
-rw-r--r--vcproj-8/txt-converter-char.vcproj12
-rw-r--r--vcproj-8/txt-converter-login.vcproj12
10 files changed, 130 insertions, 120 deletions
diff --git a/vcproj-8/char-server_sql.vcproj b/vcproj-8/char-server_sql.vcproj
index 0a11b2ab7..4d83d6c88 100644
--- a/vcproj-8/char-server_sql.vcproj
+++ b/vcproj-8/char-server_sql.vcproj
@@ -41,7 +41,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"
@@ -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)\$(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"
@@ -394,19 +394,19 @@
>
</File>
<File
- RelativePath="..\src\char_sql\int_storage.c"
+ RelativePath="..\src\char_sql\int_quest.c"
>
</File>
<File
- RelativePath="..\src\char_sql\int_storage.h"
+ RelativePath="..\src\char_sql\int_quest.h"
>
</File>
<File
- RelativePath="..\src\char_sql\int_quest.c"
+ RelativePath="..\src\char_sql\int_storage.c"
>
</File>
<File
- RelativePath="..\src\char_sql\int_quest.h"
+ RelativePath="..\src\char_sql\int_storage.h"
>
</File>
<File
diff --git a/vcproj-8/char-server_txt.vcproj b/vcproj-8/char-server_txt.vcproj
index 531c5519e..b18463c09 100644
--- a/vcproj-8/char-server_txt.vcproj
+++ b/vcproj-8/char-server_txt.vcproj
@@ -41,7 +41,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"
@@ -67,10 +67,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-8/ladmin.vcproj b/vcproj-8/ladmin.vcproj
index 659540dd6..43bd098ad 100644
--- a/vcproj-8/ladmin.vcproj
+++ b/vcproj-8/ladmin.vcproj
@@ -40,7 +40,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"
@@ -134,7 +134,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"
@@ -160,7 +160,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-8/login-server_sql.vcproj b/vcproj-8/login-server_sql.vcproj
index 9a128df80..07531ce61 100644
--- a/vcproj-8/login-server_sql.vcproj
+++ b/vcproj-8/login-server_sql.vcproj
@@ -41,8 +41,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"
@@ -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)\$(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"
@@ -208,11 +208,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-8/login-server_txt.vcproj b/vcproj-8/login-server_txt.vcproj
index d4611de8d..61e395b30 100644
--- a/vcproj-8/login-server_txt.vcproj
+++ b/vcproj-8/login-server_txt.vcproj
@@ -41,8 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4100"
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;ACCOUNTDB_ENGINE_0=rj"
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"
@@ -135,8 +134,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;ACCOUNTDB_ENGINE_0=rj"
StringPooling="true"
RuntimeLibrary="0"
DefaultCharIsUnsigned="false"
@@ -157,10 +155,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"
@@ -204,10 +202,30 @@
Name="login_txt"
>
<File
+ RelativePath="..\src\login\account.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\login\account_rj.c"
+ >
+ </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>
@@ -215,6 +233,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-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj
index d6cbf3f2d..71b04f1b4 100644
--- a/vcproj-8/map-server_sql.vcproj
+++ b/vcproj-8/map-server_sql.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100"
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"
@@ -137,7 +137,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"
@@ -162,7 +162,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"
@@ -344,18 +344,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
@@ -523,15 +511,19 @@
>
</File>
<File
- RelativePath="..\src\map\pcre.h"
+ RelativePath="..\src\map\pet.c"
>
</File>
<File
- RelativePath="..\src\map\pet.c"
+ RelativePath="..\src\map\pet.h"
>
</File>
<File
- RelativePath="..\src\map\pet.h"
+ RelativePath="..\src\map\quest.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\map\quest.h"
>
</File>
<File
@@ -590,14 +582,6 @@
RelativePath="..\src\map\vending.h"
>
</File>
- <File
- RelativePath="..\src\map\quest.c"
- >
- </File>
- <File
- RelativePath="..\src\map\quest.h"
- >
- </File>
</Filter>
</Files>
<Globals>
diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj
index db7453962..e3f5d75af 100644
--- a/vcproj-8/map-server_txt.vcproj
+++ b/vcproj-8/map-server_txt.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100"
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"
@@ -136,7 +136,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"
@@ -162,7 +162,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"
@@ -370,15 +370,19 @@
>
</File>
<File
- RelativePath="..\src\map\pcre.h"
+ RelativePath="..\src\map\pet.c"
>
</File>
<File
- RelativePath="..\src\map\pet.c"
+ RelativePath="..\src\map\pet.h"
>
</File>
<File
- RelativePath="..\src\map\pet.h"
+ RelativePath="..\src\map\quest.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\map\quest.h"
>
</File>
<File
@@ -437,26 +441,6 @@
RelativePath="..\src\map\vending.h"
>
</File>
- <File
- RelativePath="..\src\map\quest.c"
- >
- </File>
- <File
- RelativePath="..\src\map\quest.h"
- >
- </File>
- </Filter>
- <Filter
- Name="zlib"
- >
- <File
- RelativePath="..\src\zlib\zconf.h"
- >
- </File>
- <File
- RelativePath="..\src\zlib\zlib.h"
- >
- </File>
</Filter>
<Filter
Name="common"
diff --git a/vcproj-8/mapcache.vcproj b/vcproj-8/mapcache.vcproj
index d8ce12141..4e11d76d2 100644
--- a/vcproj-8/mapcache.vcproj
+++ b/vcproj-8/mapcache.vcproj
@@ -40,7 +40,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"
@@ -134,7 +134,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\src\common;..\src\zlib"
+ AdditionalIncludeDirectories="..\3rdparty\zlib\include"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
@@ -160,7 +160,7 @@
AdditionalDependencies="libcmt.lib oldnames.lib zdll.lib"
OutputFile="$(OutDir)\mapcache.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\zlib\lib"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
@@ -216,18 +216,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-8/txt-converter-char.vcproj b/vcproj-8/txt-converter-char.vcproj
index bacd687a2..608544d68 100644
--- a/vcproj-8/txt-converter-char.vcproj
+++ b/vcproj-8/txt-converter-char.vcproj
@@ -41,7 +41,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"
@@ -133,7 +133,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"
@@ -157,10 +157,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"
diff --git a/vcproj-8/txt-converter-login.vcproj b/vcproj-8/txt-converter-login.vcproj
index 3036b0f3f..da37608c8 100644
--- a/vcproj-8/txt-converter-login.vcproj
+++ b/vcproj-8/txt-converter-login.vcproj
@@ -41,7 +41,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"
@@ -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;MINICORE;TXT_SQL_CONVERT"
StringPooling="true"
RuntimeLibrary="0"
@@ -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)\login-converter.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\3rdparty\mysql\lib"
IgnoreAllDefaultLibraries="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 12:22:12 +0000