From 83500a3c5899522a36123d00bf2e93b40f0088ce Mon Sep 17 00:00:00 2001
From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 31 Mar 2005 04:02:06 +0000
Subject: [PATCH] Finished native SQL projects [MouseJstr]

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1351 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-SVN.txt              |  1 +
 src/common/socket.h            |  1 -
 src/map/map.h                  |  2 ++
 vcproj/char-server_sql.vcproj  |  9 +++++----
 vcproj/login-server_sql.vcproj |  9 +++++----
 vcproj/map-server_sql.vcproj   | 10 ++++++----
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index cda6a2b7c0..b642a4a1a3 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -2,6 +2,7 @@
 Date	Added
 
 03/30
+        * sql native vc7 projects now build/link [1351: MouseJstr]
         * Began sql projects for VC7 [1349: MouseJstr]
         * text char-server and login-server now build using VC7.  You
           can use the eAthena.sln solution to build all three.  These
diff --git a/src/common/socket.h b/src/common/socket.h
index 6793cfdb57..37d41203e6 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -7,7 +7,6 @@
 
 #ifdef __WIN32
 #include <winsock.h>
-#define close(fd) closesocket(fd)
 #else
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/src/map/map.h b/src/map/map.h
index 81d1b8cbc9..68a2f1d4df 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -816,6 +816,8 @@ extern char *GRF_PATH_FILENAME;
 #ifndef TXT_ONLY
 
 // MySQL
+#include <my_global.h>
+#include <my_sys.h>
 #include <mysql.h>
 
 void char_online_check(void); // [Valaris]
diff --git a/vcproj/char-server_sql.vcproj b/vcproj/char-server_sql.vcproj
index fb8b90f8b3..3a0d6e6009 100644
--- a/vcproj/char-server_sql.vcproj
+++ b/vcproj/char-server_sql.vcproj
@@ -19,11 +19,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src\common;;src\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
+				AdditionalIncludeDirectories="..\src\common;;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -32,9 +32,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib"
+				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
 				OutputFile="../char-server_sql.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
 				SubSystem="1"
diff --git a/vcproj/login-server_sql.vcproj b/vcproj/login-server_sql.vcproj
index 0461516e31..931dea77ad 100644
--- a/vcproj/login-server_sql.vcproj
+++ b/vcproj/login-server_sql.vcproj
@@ -19,11 +19,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="src\common;src\map;src\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
+				AdditionalIncludeDirectories="src\common;src\map;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -32,9 +32,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib"
+				AdditionalDependencies="WSOCK32.lib  mysqlclient.lib"
 				OutputFile="..\login-server_sql.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/eAthena.pdb"
 				SubSystem="1"
diff --git a/vcproj/map-server_sql.vcproj b/vcproj/map-server_sql.vcproj
index 017ab2fcba..cbde0d29a4 100644
--- a/vcproj/map-server_sql.vcproj
+++ b/vcproj/map-server_sql.vcproj
@@ -19,11 +19,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
+				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -32,9 +32,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="WSOCK32.lib"
+				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
 				OutputFile="..\map-server_sql.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="..\map-server_sql.pdb"
 				SubSystem="1"