From 4d81f68ece4dee6282024fe7189d8402a05428db Mon Sep 17 00:00:00 2001 From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> Date: Wed, 30 Mar 2005 22:14:36 +0000 Subject: eAthena VC7 solution and support added for native builds [MouseJstr] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1347 54d463be-8e91-2dee-dedb-b68131a5f0ec --- vcproj/char-server_txt.vcproj | 179 +++++++++++++++++++ vcproj/login-server_txt.vcproj | 167 ++++++++++++++++++ vcproj/map-server_txt.vcproj | 377 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 723 insertions(+) create mode 100644 vcproj/char-server_txt.vcproj create mode 100644 vcproj/login-server_txt.vcproj create mode 100644 vcproj/map-server_txt.vcproj (limited to 'vcproj') diff --git a/vcproj/char-server_txt.vcproj b/vcproj/char-server_txt.vcproj new file mode 100644 index 000000000..809c06124 --- /dev/null +++ b/vcproj/char-server_txt.vcproj @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="char-server_txt" + ProjectGUID="{D356871D-58E1-450B-967A-E3E9646175AF}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug-char" + IntermediateDirectory="Debug-char" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\src\common;;src\zlib" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="5" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="WSOCK32.lib" + OutputFile="..\char-server.exe" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/eAthena.pdb" + SubSystem="1" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release-char" + IntermediateDirectory="Release-char" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="4" + UsePrecompiledHeader="3" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)/eAthena.exe" + LinkIncremental="1" + GenerateDebugInformation="TRUE" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + <File + RelativePath="..\src\char\char.c"> + </File> + <File + RelativePath="..\src\common\core.c"> + </File> + <File + RelativePath="..\src\common\db.c"> + </File> + <File + RelativePath="..\src\char\int_guild.c"> + </File> + <File + RelativePath="..\src\char\int_party.c"> + </File> + <File + RelativePath="..\src\char\int_pet.c"> + </File> + <File + RelativePath="..\src\char\int_storage.c"> + </File> + <File + RelativePath="..\src\char\inter.c"> + </File> + <File + RelativePath="..\src\common\lock.c"> + </File> + <File + RelativePath="..\src\common\malloc.c"> + </File> + <File + RelativePath="..\src\common\nullpo.c"> + </File> + <File + RelativePath="..\src\common\showmsg.c"> + </File> + <File + RelativePath="..\src\common\socket.c"> + </File> + <File + RelativePath="..\src\common\strlib.c"> + </File> + <File + RelativePath="..\src\common\timer.c"> + </File> + <File + RelativePath="..\src\common\utils.c"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/vcproj/login-server_txt.vcproj b/vcproj/login-server_txt.vcproj new file mode 100644 index 000000000..679c06cc7 --- /dev/null +++ b/vcproj/login-server_txt.vcproj @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="login-server_txt" + ProjectGUID="{D356871D-58E1-450B-967A-E2E9646175AF}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug-login" + IntermediateDirectory="Debug-login" + ConfigurationType="1" + CharacterSet="2"> + <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" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="5" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="WSOCK32.lib" + OutputFile="..\login-server.exe" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/eAthena.pdb" + SubSystem="1" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release-login" + IntermediateDirectory="Release-login" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="4" + UsePrecompiledHeader="3" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)/eAthena.exe" + LinkIncremental="1" + GenerateDebugInformation="TRUE" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + <File + RelativePath="..\src\common\core.c"> + </File> + <File + RelativePath="..\src\common\db.c"> + </File> + <File + RelativePath="..\src\common\lock.c"> + </File> + <File + RelativePath="..\src\login\login.c"> + </File> + <File + RelativePath="..\src\common\malloc.c"> + </File> + <File + RelativePath="..\src\login\md5calc.c"> + </File> + <File + RelativePath="..\src\common\nullpo.c"> + </File> + <File + RelativePath="..\src\common\showmsg.c"> + </File> + <File + RelativePath="..\src\common\socket.c"> + </File> + <File + RelativePath="..\src\common\strlib.c"> + </File> + <File + RelativePath="..\src\common\timer.c"> + </File> + <File + RelativePath="..\src\common\utils.c"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/vcproj/map-server_txt.vcproj b/vcproj/map-server_txt.vcproj new file mode 100644 index 000000000..3387ea695 --- /dev/null +++ b/vcproj/map-server_txt.vcproj @@ -0,0 +1,377 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="map-server_txt" + ProjectGUID="{D356871D-58E1-450B-967A-E1E9646175AF}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug-map" + IntermediateDirectory="Debug-map" + ConfigurationType="1" + CharacterSet="2"> + <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" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="5" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="WSOCK32.lib" + OutputFile="..\map-server.exe" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/eAthena.pdb" + SubSystem="1" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release-map" + IntermediateDirectory="Release-map" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="4" + UsePrecompiledHeader="3" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)/eAthena.exe" + LinkIncremental="1" + GenerateDebugInformation="TRUE" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + <File + RelativePath="..\src\zlib\adler32.c"> + </File> + <File + RelativePath="..\src\map\atcommand.c"> + </File> + <File + RelativePath="..\src\map\battle.c"> + </File> + <File + RelativePath="..\src\map\charcommand.c"> + </File> + <File + RelativePath="..\src\map\chat.c"> + </File> + <File + RelativePath="..\src\map\chrif.c"> + </File> + <File + RelativePath="..\src\map\clif.c"> + </File> + <File + RelativePath="..\src\zlib\compress.c"> + </File> + <File + RelativePath="..\src\common\core.c"> + </File> + <File + RelativePath="..\src\zlib\crc32.c"> + </File> + <File + RelativePath="..\src\common\db.c"> + </File> + <File + RelativePath="..\src\zlib\deflate.c"> + </File> + <File + RelativePath="..\src\common\grfio.c"> + </File> + <File + RelativePath="..\src\map\guild.c"> + </File> + <File + RelativePath="..\src\zlib\inffast.c"> + </File> + <File + RelativePath="..\src\zlib\inflate.c"> + </File> + <File + RelativePath="..\src\zlib\inftrees.c"> + </File> + <File + RelativePath="..\src\map\intif.c"> + </File> + <File + RelativePath="..\src\map\itemdb.c"> + </File> + <File + RelativePath="..\src\common\lock.c"> + </File> + <File + RelativePath="..\src\map\log.c"> + </File> + <File + RelativePath="..\src\map\mail.c"> + </File> + <File + RelativePath="..\src\common\malloc.c"> + </File> + <File + RelativePath="..\src\map\map.c"> + </File> + <File + RelativePath="..\src\map\mob.c"> + </File> + <File + RelativePath="..\src\map\npc.c"> + </File> + <File + RelativePath="..\src\map\npc_chat.c"> + </File> + <File + RelativePath="..\src\common\nullpo.c"> + </File> + <File + RelativePath="..\src\map\party.c"> + </File> + <File + RelativePath="..\src\map\path.c"> + </File> + <File + RelativePath="..\src\map\pc.c"> + </File> + <File + RelativePath="..\src\map\pet.c"> + </File> + <File + RelativePath="..\src\map\script.c"> + </File> + <File + RelativePath="..\src\common\showmsg.c"> + </File> + <File + RelativePath="..\src\map\skill.c"> + </File> + <File + RelativePath="..\src\common\socket.c"> + </File> + <File + RelativePath="..\src\map\status.c"> + </File> + <File + RelativePath="..\src\map\storage.c"> + </File> + <File + RelativePath="..\src\common\strlib.c"> + </File> + <File + RelativePath="..\src\common\timer.c"> + </File> + <File + RelativePath="..\src\map\trade.c"> + </File> + <File + RelativePath="..\src\zlib\trees.c"> + </File> + <File + RelativePath="..\src\common\utils.c"> + </File> + <File + RelativePath="..\src\map\vending.c"> + </File> + <File + RelativePath="..\src\zlib\zutil.c"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + <File + RelativePath="..\src\map\atcommand.h"> + </File> + <File + RelativePath="..\src\map\battle.h"> + </File> + <File + RelativePath="..\src\common\buffer.h"> + </File> + <File + RelativePath="..\src\map\charcommand.h"> + </File> + <File + RelativePath="..\src\map\chat.h"> + </File> + <File + RelativePath="..\src\map\chrif.h"> + </File> + <File + RelativePath="..\src\map\clif.h"> + </File> + <File + RelativePath="..\src\common\core.h"> + </File> + <File + RelativePath="..\src\common\db.h"> + </File> + <File + RelativePath="..\src\common\grfio.h"> + </File> + <File + RelativePath="..\src\map\guild.h"> + </File> + <File + RelativePath="..\src\map\intif.h"> + </File> + <File + RelativePath="..\src\map\itemdb.h"> + </File> + <File + RelativePath="..\src\common\lock.h"> + </File> + <File + RelativePath="..\src\map\log.h"> + </File> + <File + RelativePath="..\src\map\mail.h"> + </File> + <File + RelativePath="..\src\common\malloc.h"> + </File> + <File + RelativePath="..\src\map\map.h"> + </File> + <File + RelativePath="..\src\common\mmo.h"> + </File> + <File + RelativePath="..\src\map\mob.h"> + </File> + <File + RelativePath="..\src\map\npc.h"> + </File> + <File + RelativePath="..\src\common\nullpo.h"> + </File> + <File + RelativePath="..\src\map\party.h"> + </File> + <File + RelativePath="..\src\map\pc.h"> + </File> + <File + RelativePath="..\src\map\pet.h"> + </File> + <File + RelativePath="..\src\map\script.h"> + </File> + <File + RelativePath="..\src\common\showmsg.h"> + </File> + <File + RelativePath="..\src\map\skill.h"> + </File> + <File + RelativePath="..\src\common\socket.h"> + </File> + <File + RelativePath="..\src\map\status.h"> + </File> + <File + RelativePath="..\src\map\storage.h"> + </File> + <File + RelativePath="..\src\common\strlib.h"> + </File> + <File + RelativePath="..\src\common\timer.h"> + </File> + <File + RelativePath="..\src\map\trade.h"> + </File> + <File + RelativePath="..\src\common\utils.h"> + </File> + <File + RelativePath="..\src\map\vending.h"> + </File> + <File + RelativePath="..\src\common\version.h"> + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> -- cgit v1.2.3-70-g09d2 From 382ce9ad80de448431c1490185f02b123e1cd08f Mon Sep 17 00:00:00 2001 From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> Date: Thu, 31 Mar 2005 00:33:12 +0000 Subject: added sql projects for eAthena git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1349 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-SVN.txt | 3 +- eAthena.sln | 24 +++ vcproj/char-server_sql.vcproj | 179 +++++++++++++++++++ vcproj/char-server_txt.vcproj | 2 +- vcproj/login-server_sql.vcproj | 167 ++++++++++++++++++ vcproj/map-server_sql.vcproj | 377 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 750 insertions(+), 2 deletions(-) create mode 100644 vcproj/char-server_sql.vcproj create mode 100644 vcproj/login-server_sql.vcproj create mode 100644 vcproj/map-server_sql.vcproj (limited to 'vcproj') diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt index d4ebdfe8b..cda6a2b7c 100644 --- a/Changelog-SVN.txt +++ b/Changelog-SVN.txt @@ -2,11 +2,12 @@ Date Added 03/30 + * 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 are currently just the text versions of the servers. I have not added projects yet to build the sql versions. - [SVN: 1357 MouseJstr] + [SVN: 1347 MouseJstr] * Made the map-server build cleanly using Microsoft Visual Studio.. entirely native code without any cygwin dependency [SVN: 1345 MouseJstr] diff --git a/eAthena.sln b/eAthena.sln index 830da50d5..b8444b1bb 100644 --- a/eAthena.sln +++ b/eAthena.sln @@ -11,6 +11,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_txt", "vcproj\c ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj\char-server_sql.vcproj", "{D356871D-58E1-450B-967A-E4E9646175AF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj\login-server_sql.vcproj", "{D356871D-58E1-450B-967A-E5E9646175AF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj\map-server_sql.vcproj", "{D356871D-58E1-450B-967A-E6E9646175AF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -29,6 +41,18 @@ Global {D356871D-58E1-450B-967A-E3E9646175AF}.Debug.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E3E9646175AF}.Release.ActiveCfg = Release|Win32 {D356871D-58E1-450B-967A-E3E9646175AF}.Release.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Debug.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Debug.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Release.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Release.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Debug.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Debug.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Release.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Release.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Debug.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Debug.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Release.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/vcproj/char-server_sql.vcproj b/vcproj/char-server_sql.vcproj new file mode 100644 index 000000000..fb8b90f8b --- /dev/null +++ b/vcproj/char-server_sql.vcproj @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="char-server_sql" + ProjectGUID="{D356871D-58E1-450B-967A-E4E9646175AF}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug-sqlchar" + IntermediateDirectory="Debug-sqlchar" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\src\common;;src\zlib" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="5" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="WSOCK32.lib" + OutputFile="../char-server_sql.exe" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/eAthena.pdb" + SubSystem="1" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release-sqlchar" + IntermediateDirectory="Release-sqlchar" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="4" + UsePrecompiledHeader="3" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="../char-server_sql.exe" + LinkIncremental="1" + GenerateDebugInformation="TRUE" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + <File + RelativePath="..\src\char\char.c"> + </File> + <File + RelativePath="..\src\common\core.c"> + </File> + <File + RelativePath="..\src\common\db.c"> + </File> + <File + RelativePath="..\src\char\int_guild.c"> + </File> + <File + RelativePath="..\src\char\int_party.c"> + </File> + <File + RelativePath="..\src\char\int_pet.c"> + </File> + <File + RelativePath="..\src\char\int_storage.c"> + </File> + <File + RelativePath="..\src\char\inter.c"> + </File> + <File + RelativePath="..\src\common\lock.c"> + </File> + <File + RelativePath="..\src\common\malloc.c"> + </File> + <File + RelativePath="..\src\common\nullpo.c"> + </File> + <File + RelativePath="..\src\common\showmsg.c"> + </File> + <File + RelativePath="..\src\common\socket.c"> + </File> + <File + RelativePath="..\src\common\strlib.c"> + </File> + <File + RelativePath="..\src\common\timer.c"> + </File> + <File + RelativePath="..\src\common\utils.c"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/vcproj/char-server_txt.vcproj b/vcproj/char-server_txt.vcproj index 809c06124..8ccd9a5ed 100644 --- a/vcproj/char-server_txt.vcproj +++ b/vcproj/char-server_txt.vcproj @@ -78,7 +78,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/eAthena.exe" + OutputFile="..\char-server.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" SubSystem="1" diff --git a/vcproj/login-server_sql.vcproj b/vcproj/login-server_sql.vcproj new file mode 100644 index 000000000..0461516e3 --- /dev/null +++ b/vcproj/login-server_sql.vcproj @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="login-server_sql" + ProjectGUID="{D356871D-58E1-450B-967A-E5E9646175AF}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug-sqllogin" + IntermediateDirectory="Debug-sqllogin" + ConfigurationType="1" + CharacterSet="2"> + <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" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="5" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="WSOCK32.lib" + OutputFile="..\login-server_sql.exe" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/eAthena.pdb" + SubSystem="1" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release-sqllogin" + IntermediateDirectory="Release-sqllogin" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="4" + UsePrecompiledHeader="3" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="..\login-server_sql.exe" + LinkIncremental="1" + GenerateDebugInformation="TRUE" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + <File + RelativePath="..\src\common\core.c"> + </File> + <File + RelativePath="..\src\common\db.c"> + </File> + <File + RelativePath="..\src\common\lock.c"> + </File> + <File + RelativePath="..\src\login\login.c"> + </File> + <File + RelativePath="..\src\common\malloc.c"> + </File> + <File + RelativePath="..\src\login\md5calc.c"> + </File> + <File + RelativePath="..\src\common\nullpo.c"> + </File> + <File + RelativePath="..\src\common\showmsg.c"> + </File> + <File + RelativePath="..\src\common\socket.c"> + </File> + <File + RelativePath="..\src\common\strlib.c"> + </File> + <File + RelativePath="..\src\common\timer.c"> + </File> + <File + RelativePath="..\src\common\utils.c"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/vcproj/map-server_sql.vcproj b/vcproj/map-server_sql.vcproj new file mode 100644 index 000000000..017ab2fcb --- /dev/null +++ b/vcproj/map-server_sql.vcproj @@ -0,0 +1,377 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="map-server_sql" + ProjectGUID="{D356871D-58E1-450B-967A-E6E9646175AF}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug-sqlmap" + IntermediateDirectory="Debug-sqlmap" + ConfigurationType="1" + CharacterSet="2"> + <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" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="5" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="WSOCK32.lib" + OutputFile="..\map-server_sql.exe" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\map-server_sql.pdb" + SubSystem="1" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release-sqlmap" + IntermediateDirectory="Release-sqlmap" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="4" + UsePrecompiledHeader="3" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="..\map-server_sql.exe" + LinkIncremental="1" + GenerateDebugInformation="TRUE" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + <File + RelativePath="..\src\zlib\adler32.c"> + </File> + <File + RelativePath="..\src\map\atcommand.c"> + </File> + <File + RelativePath="..\src\map\battle.c"> + </File> + <File + RelativePath="..\src\map\charcommand.c"> + </File> + <File + RelativePath="..\src\map\chat.c"> + </File> + <File + RelativePath="..\src\map\chrif.c"> + </File> + <File + RelativePath="..\src\map\clif.c"> + </File> + <File + RelativePath="..\src\zlib\compress.c"> + </File> + <File + RelativePath="..\src\common\core.c"> + </File> + <File + RelativePath="..\src\zlib\crc32.c"> + </File> + <File + RelativePath="..\src\common\db.c"> + </File> + <File + RelativePath="..\src\zlib\deflate.c"> + </File> + <File + RelativePath="..\src\common\grfio.c"> + </File> + <File + RelativePath="..\src\map\guild.c"> + </File> + <File + RelativePath="..\src\zlib\inffast.c"> + </File> + <File + RelativePath="..\src\zlib\inflate.c"> + </File> + <File + RelativePath="..\src\zlib\inftrees.c"> + </File> + <File + RelativePath="..\src\map\intif.c"> + </File> + <File + RelativePath="..\src\map\itemdb.c"> + </File> + <File + RelativePath="..\src\common\lock.c"> + </File> + <File + RelativePath="..\src\map\log.c"> + </File> + <File + RelativePath="..\src\map\mail.c"> + </File> + <File + RelativePath="..\src\common\malloc.c"> + </File> + <File + RelativePath="..\src\map\map.c"> + </File> + <File + RelativePath="..\src\map\mob.c"> + </File> + <File + RelativePath="..\src\map\npc.c"> + </File> + <File + RelativePath="..\src\map\npc_chat.c"> + </File> + <File + RelativePath="..\src\common\nullpo.c"> + </File> + <File + RelativePath="..\src\map\party.c"> + </File> + <File + RelativePath="..\src\map\path.c"> + </File> + <File + RelativePath="..\src\map\pc.c"> + </File> + <File + RelativePath="..\src\map\pet.c"> + </File> + <File + RelativePath="..\src\map\script.c"> + </File> + <File + RelativePath="..\src\common\showmsg.c"> + </File> + <File + RelativePath="..\src\map\skill.c"> + </File> + <File + RelativePath="..\src\common\socket.c"> + </File> + <File + RelativePath="..\src\map\status.c"> + </File> + <File + RelativePath="..\src\map\storage.c"> + </File> + <File + RelativePath="..\src\common\strlib.c"> + </File> + <File + RelativePath="..\src\common\timer.c"> + </File> + <File + RelativePath="..\src\map\trade.c"> + </File> + <File + RelativePath="..\src\zlib\trees.c"> + </File> + <File + RelativePath="..\src\common\utils.c"> + </File> + <File + RelativePath="..\src\map\vending.c"> + </File> + <File + RelativePath="..\src\zlib\zutil.c"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + <File + RelativePath="..\src\map\atcommand.h"> + </File> + <File + RelativePath="..\src\map\battle.h"> + </File> + <File + RelativePath="..\src\common\buffer.h"> + </File> + <File + RelativePath="..\src\map\charcommand.h"> + </File> + <File + RelativePath="..\src\map\chat.h"> + </File> + <File + RelativePath="..\src\map\chrif.h"> + </File> + <File + RelativePath="..\src\map\clif.h"> + </File> + <File + RelativePath="..\src\common\core.h"> + </File> + <File + RelativePath="..\src\common\db.h"> + </File> + <File + RelativePath="..\src\common\grfio.h"> + </File> + <File + RelativePath="..\src\map\guild.h"> + </File> + <File + RelativePath="..\src\map\intif.h"> + </File> + <File + RelativePath="..\src\map\itemdb.h"> + </File> + <File + RelativePath="..\src\common\lock.h"> + </File> + <File + RelativePath="..\src\map\log.h"> + </File> + <File + RelativePath="..\src\map\mail.h"> + </File> + <File + RelativePath="..\src\common\malloc.h"> + </File> + <File + RelativePath="..\src\map\map.h"> + </File> + <File + RelativePath="..\src\common\mmo.h"> + </File> + <File + RelativePath="..\src\map\mob.h"> + </File> + <File + RelativePath="..\src\map\npc.h"> + </File> + <File + RelativePath="..\src\common\nullpo.h"> + </File> + <File + RelativePath="..\src\map\party.h"> + </File> + <File + RelativePath="..\src\map\pc.h"> + </File> + <File + RelativePath="..\src\map\pet.h"> + </File> + <File + RelativePath="..\src\map\script.h"> + </File> + <File + RelativePath="..\src\common\showmsg.h"> + </File> + <File + RelativePath="..\src\map\skill.h"> + </File> + <File + RelativePath="..\src\common\socket.h"> + </File> + <File + RelativePath="..\src\map\status.h"> + </File> + <File + RelativePath="..\src\map\storage.h"> + </File> + <File + RelativePath="..\src\common\strlib.h"> + </File> + <File + RelativePath="..\src\common\timer.h"> + </File> + <File + RelativePath="..\src\map\trade.h"> + </File> + <File + RelativePath="..\src\common\utils.h"> + </File> + <File + RelativePath="..\src\map\vending.h"> + </File> + <File + RelativePath="..\src\common\version.h"> + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> -- cgit v1.2.3-70-g09d2 From 46d4b13630a44f86a92b7269c46661947af6b659 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: Finished native SQL projects [MouseJstr] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/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(-) (limited to 'vcproj') diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt index cda6a2b7c..b642a4a1a 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 6793cfdb5..37d41203e 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 81d1b8cbc..68a2f1d4d 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 fb8b90f8b..3a0d6e600 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 0461516e3..931dea77a 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 017ab2fcb..cbde0d29a 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" -- cgit v1.2.3-70-g09d2 From 5d58b51f5c8332f20d152ee1364f10d190506683 Mon Sep 17 00:00:00 2001 From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> Date: Thu, 31 Mar 2005 21:03:22 +0000 Subject: fixed memory corruption in mapif_guild_info:int_guild.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1367 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-SVN.txt | 2 ++ src/char/int_guild.c | 2 +- vcproj/char-server_sql.vcproj | 9 ++++++--- vcproj/char-server_txt.vcproj | 9 ++++++--- vcproj/login-server_sql.vcproj | 10 ++++++---- vcproj/login-server_txt.vcproj | 10 ++++++---- vcproj/map-server_sql.vcproj | 9 ++++++--- vcproj/map-server_txt.vcproj | 6 ++++-- 8 files changed, 37 insertions(+), 20 deletions(-) (limited to 'vcproj') diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt index 4c1330d07..0a952fafb 100644 --- a/Changelog-SVN.txt +++ b/Changelog-SVN.txt @@ -2,6 +2,8 @@ Date Added 03/31 + * fixed memory corruption in mapif_guild_info:int_guild.c + [SVN 1367: MouseJstr] * Fixed common/lock.c (problem with unistd.h include) [Codemaster] * Added father/mother/child fields to mmo_char_tostr() and mmo_char_fromstr() [veider] diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 95f0cf099..9268d9339 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -731,7 +731,7 @@ int mapif_guild_noinfo(int fd, int guild_id) { // �M���h���܂Ƃߑ��� int mapif_guild_info(int fd, struct guild *g) { - unsigned char buf[2048]; + unsigned char buf[16384]; WBUFW(buf,0) = 0x3831; memcpy(buf + 4, g, sizeof(struct guild)); diff --git a/vcproj/char-server_sql.vcproj b/vcproj/char-server_sql.vcproj index 3a0d6e600..f2ba8781d 100644 --- a/vcproj/char-server_sql.vcproj +++ b/vcproj/char-server_sql.vcproj @@ -69,9 +69,10 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="4" - UsePrecompiledHeader="3" + AdditionalIncludeDirectories="..\src\common;;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB" + RuntimeLibrary="1" + UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3"/> @@ -79,6 +80,8 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalDependencies="WSOCK32.lib mysqlclient.lib" + AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug" OutputFile="../char-server_sql.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" diff --git a/vcproj/char-server_txt.vcproj b/vcproj/char-server_txt.vcproj index 8ccd9a5ed..26319cd9e 100644 --- a/vcproj/char-server_txt.vcproj +++ b/vcproj/char-server_txt.vcproj @@ -68,9 +68,11 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="4" - UsePrecompiledHeader="3" + AdditionalIncludeDirectories="..\src\common;;src\zlib" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB" + + RuntimeLibrary="5" + UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3"/> @@ -78,6 +80,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalDependencies="WSOCK32.lib" OutputFile="..\char-server.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" diff --git a/vcproj/login-server_sql.vcproj b/vcproj/login-server_sql.vcproj index 931dea77a..dcf4fc108 100644 --- a/vcproj/login-server_sql.vcproj +++ b/vcproj/login-server_sql.vcproj @@ -69,9 +69,10 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="4" - UsePrecompiledHeader="3" + AdditionalIncludeDirectories="src\common;src\map;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB" + RuntimeLibrary="1" + UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3"/> @@ -79,7 +80,8 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - OutputFile="..\login-server_sql.exe" + AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug" + AdditionalDependencies="WSOCK32.lib mysqlclient.lib" OutputFile="..\login-server_sql.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" SubSystem="1" diff --git a/vcproj/login-server_txt.vcproj b/vcproj/login-server_txt.vcproj index 679c06cc7..84766b3af 100644 --- a/vcproj/login-server_txt.vcproj +++ b/vcproj/login-server_txt.vcproj @@ -68,9 +68,10 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="4" - UsePrecompiledHeader="3" + AdditionalIncludeDirectories="src\common;src\map;src\zlib" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB" + RuntimeLibrary="1" + UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3"/> @@ -78,7 +79,8 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/eAthena.exe" + AdditionalDependencies="WSOCK32.lib" + OutputFile="..\login-server.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" SubSystem="1" diff --git a/vcproj/map-server_sql.vcproj b/vcproj/map-server_sql.vcproj index cbde0d29a..f1dc809ce 100644 --- a/vcproj/map-server_sql.vcproj +++ b/vcproj/map-server_sql.vcproj @@ -70,9 +70,10 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="4" - UsePrecompiledHeader="3" + AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB" + RuntimeLibrary="1" + UsePrecompiledHeader="1" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3"/> @@ -80,6 +81,8 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalDependencies="WSOCK32.lib mysqlclient.lib" + AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug" OutputFile="..\map-server_sql.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" diff --git a/vcproj/map-server_txt.vcproj b/vcproj/map-server_txt.vcproj index 3387ea695..83aac2565 100644 --- a/vcproj/map-server_txt.vcproj +++ b/vcproj/map-server_txt.vcproj @@ -68,7 +68,8 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB" RuntimeLibrary="4" UsePrecompiledHeader="3" WarningLevel="3" @@ -78,7 +79,8 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/eAthena.exe" + AdditionalDependencies="WSOCK32.lib" + OutputFile="..\map-server.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" SubSystem="1" -- cgit v1.2.3-70-g09d2 From c69afb240261d6c513f44c0b306ec36632337cdf Mon Sep 17 00:00:00 2001 From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> Date: Thu, 31 Mar 2005 21:13:29 +0000 Subject: release builds for txt servers work git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1368 54d463be-8e91-2dee-dedb-b68131a5f0ec --- eAthena.sln | 3 --- vcproj/map-server_txt.vcproj | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'vcproj') diff --git a/eAthena.sln b/eAthena.sln index b8444b1bb..66b082b91 100644 --- a/eAthena.sln +++ b/eAthena.sln @@ -44,15 +44,12 @@ Global {D356871D-58E1-450B-967A-E4E9646175AF}.Debug.ActiveCfg = Debug|Win32 {D356871D-58E1-450B-967A-E4E9646175AF}.Debug.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E4E9646175AF}.Release.ActiveCfg = Release|Win32 - {D356871D-58E1-450B-967A-E4E9646175AF}.Release.Build.0 = Release|Win32 {D356871D-58E1-450B-967A-E5E9646175AF}.Debug.ActiveCfg = Debug|Win32 {D356871D-58E1-450B-967A-E5E9646175AF}.Debug.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E5E9646175AF}.Release.ActiveCfg = Release|Win32 - {D356871D-58E1-450B-967A-E5E9646175AF}.Release.Build.0 = Release|Win32 {D356871D-58E1-450B-967A-E6E9646175AF}.Debug.ActiveCfg = Debug|Win32 {D356871D-58E1-450B-967A-E6E9646175AF}.Debug.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E6E9646175AF}.Release.ActiveCfg = Release|Win32 - {D356871D-58E1-450B-967A-E6E9646175AF}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/vcproj/map-server_txt.vcproj b/vcproj/map-server_txt.vcproj index 83aac2565..1a24f2ce6 100644 --- a/vcproj/map-server_txt.vcproj +++ b/vcproj/map-server_txt.vcproj @@ -71,7 +71,7 @@ AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB" RuntimeLibrary="4" - UsePrecompiledHeader="3" + UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3"/> -- cgit v1.2.3-70-g09d2 From 7bd05bfcac17ad432a430bc385445373174a4862 Mon Sep 17 00:00:00 2001 From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> Date: Fri, 1 Apr 2005 06:24:15 +0000 Subject: clean this up a bit git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1371 54d463be-8e91-2dee-dedb-b68131a5f0ec --- vcproj/map-server_txt.vcproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'vcproj') diff --git a/vcproj/map-server_txt.vcproj b/vcproj/map-server_txt.vcproj index 1a24f2ce6..aa8a75578 100644 --- a/vcproj/map-server_txt.vcproj +++ b/vcproj/map-server_txt.vcproj @@ -22,19 +22,21 @@ AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB" MinimalRebuild="TRUE" + ExceptionHandling="FALSE" BasicRuntimeChecks="3" RuntimeLibrary="5" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> + DebugInformationFormat="3"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalOptions="/FIXED:NO" AdditionalDependencies="WSOCK32.lib" OutputFile="..\map-server.exe" - LinkIncremental="2" + LinkIncremental="1" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(OutDir)/eAthena.pdb" SubSystem="1" -- cgit v1.2.3-70-g09d2