From 9ef634559f3cde232586b1dc6fd00bea3f3d8e53 Mon Sep 17 00:00:00 2001
From: ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 10 Jul 2011 06:17:06 +0000
Subject: * Merged changes from trunk [14827:14894/trunk].

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14895 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 vcproj-8/char-server_sql.vcproj  | 24 ++++++++++++++++++++++--
 vcproj-8/char-server_txt.vcproj  | 24 ++++++++++++++++++++++--
 vcproj-8/login-server_sql.vcproj | 24 ++++++++++++++++++++++--
 vcproj-8/login-server_txt.vcproj | 24 ++++++++++++++++++++++--
 vcproj-8/map-server_sql.vcproj   | 32 ++++++++++++++++++++++++++------
 vcproj-8/map-server_txt.vcproj   | 32 ++++++++++++++++++++++++++------
 6 files changed, 140 insertions(+), 20 deletions(-)

(limited to 'vcproj-8')

diff --git a/vcproj-8/char-server_sql.vcproj b/vcproj-8/char-server_sql.vcproj
index eea599498..ecee855a8 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="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				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"
@@ -133,7 +133,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				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"
@@ -195,6 +195,18 @@
 	<References>
 	</References>
 	<Files>
+		<Filter
+			Name="3rdparty"
+			>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="common"
 			>
@@ -274,6 +286,14 @@
 				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\common\random.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\random.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\common\showmsg.c"
 				>
diff --git a/vcproj-8/char-server_txt.vcproj b/vcproj-8/char-server_txt.vcproj
index 3600bb9c9..da689efe5 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="..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				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"
@@ -132,7 +132,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				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"
@@ -340,6 +340,14 @@
 				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\common\random.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\random.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\common\showmsg.c"
 				>
@@ -385,6 +393,18 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="3rdparty"
+			>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vcproj-8/login-server_sql.vcproj b/vcproj-8/login-server_sql.vcproj
index 2509f8f29..bf2526125 100644
--- a/vcproj-8/login-server_sql.vcproj
+++ b/vcproj-8/login-server_sql.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				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"
@@ -133,7 +133,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				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"
@@ -312,6 +312,14 @@
 				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\common\random.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\random.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\common\showmsg.c"
 				>
@@ -365,6 +373,18 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="3rdparty"
+			>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vcproj-8/login-server_txt.vcproj b/vcproj-8/login-server_txt.vcproj
index 35cf7639c..ba298908e 100644
--- a/vcproj-8/login-server_txt.vcproj
+++ b/vcproj-8/login-server_txt.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				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"
@@ -131,7 +131,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				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"
@@ -303,6 +303,14 @@
 				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\common\random.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\random.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\common\showmsg.c"
 				>
@@ -348,6 +356,18 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="3rdparty"
+			>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/vcproj-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj
index d664e47f4..1f68af297 100644
--- a/vcproj-8/map-server_sql.vcproj
+++ b/vcproj-8/map-server_sql.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
@@ -135,7 +135,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -200,6 +200,18 @@
 	<References>
 	</References>
 	<Files>
+		<Filter
+			Name="3rdparty"
+			>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="common"
 			>
@@ -256,19 +268,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\md5calc.c"
+				RelativePath="..\src\common\mapindex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\md5calc.h"
+				RelativePath="..\src\common\mapindex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.c"
+				RelativePath="..\src\common\md5calc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.h"
+				RelativePath="..\src\common\md5calc.h"
 				>
 			</File>
 			<File
@@ -295,6 +307,14 @@
 				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\common\random.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\random.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\common\showmsg.c"
 				>
diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj
index 1f65a6f28..ab7f5ab24 100644
--- a/vcproj-8/map-server_txt.vcproj
+++ b/vcproj-8/map-server_txt.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				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"
@@ -134,7 +134,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include"
+				AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar"
 				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"
@@ -535,19 +535,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\md5calc.c"
+				RelativePath="..\src\common\mapindex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\md5calc.h"
+				RelativePath="..\src\common\mapindex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.c"
+				RelativePath="..\src\common\md5calc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\common\mapindex.h"
+				RelativePath="..\src\common\md5calc.h"
 				>
 			</File>
 			<File
@@ -574,6 +574,14 @@
 				RelativePath="..\src\common\plugins.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\common\random.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\random.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\common\showmsg.c"
 				>
@@ -619,6 +627,18 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="3rdparty"
+			>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\3rdparty\mt19937ar\mt19937ar.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
-- 
cgit v1.2.3-70-g09d2