josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use new mysql for win build

Browse Source 
+small include fix

--HG--
branch : trunk
This commit is contained in:
Rat
2010-06-20 17:14:52 +02:00
parent e0a5d00116
commit c43ef87c34
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/TrinityCore&Script VC90.sln
+9
View File
@@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC90\shared.vcpro
{803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2} {803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2}
{BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {BD537C9A-FECA-1BAD-6757-8A6348EA12C8} {BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}
{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E} {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5} = {4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityCore", "VC90\TrinityCore.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityCore", "VC90\TrinityCore.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
@@ -34,6 +35,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\externals\g3d
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "..\externals\sockets\win\VC90\sockets.vcproj", "{9DF7A84E-C644-4720-A79D-C98CB950E34C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "..\externals\sockets\win\VC90\sockets.vcproj", "{9DF7A84E-C644-4720-A79D-C98CB950E34C}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmysql", "..\externals\mysql\win\VC90\libmysql.vcproj", "{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@@ -114,6 +117,12 @@ Global
{9DF7A84E-C644-4720-A79D-C98CB950E34C}.Release|Win32.Build.0 = Release|Win32 {9DF7A84E-C644-4720-A79D-C98CB950E34C}.Release|Win32.Build.0 = Release|Win32
{9DF7A84E-C644-4720-A79D-C98CB950E34C}.Release|x64.ActiveCfg = Release|x64 {9DF7A84E-C644-4720-A79D-C98CB950E34C}.Release|x64.ActiveCfg = Release|x64
{9DF7A84E-C644-4720-A79D-C98CB950E34C}.Release|x64.Build.0 = Release|x64 {9DF7A84E-C644-4720-A79D-C98CB950E34C}.Release|x64.Build.0 = Release|x64
{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|Win32.ActiveCfg = Debug|Win32
{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|Win32.Build.0 = Debug|Win32
{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|x64.ActiveCfg = Debug|Win32
{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|Win32.ActiveCfg = Release|Win32
{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|Win32.Build.0 = Release|Win32
{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
win/VC90/TrinityCore.vcproj
+4 -4
View File
@@ -85,7 +85,7 @@
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb"
GenerateMapFile="true" GenerateMapFile="true"
@@ -185,7 +185,7 @@
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb"
GenerateMapFile="true" GenerateMapFile="true"
@@ -286,7 +286,7 @@
Version="" Version=""
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb"
GenerateMapFile="true" GenerateMapFile="true"
@@ -387,7 +387,7 @@
Version="" Version=""
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb"
GenerateMapFile="true" GenerateMapFile="true"
win/VC90/TrinityRealm.vcproj
+4 -4
View File
@@ -84,7 +84,7 @@
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb"
GenerateMapFile="true" GenerateMapFile="true"
@@ -182,7 +182,7 @@
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb"
GenerateMapFile="true" GenerateMapFile="true"
@@ -280,7 +280,7 @@
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb"
GenerateMapFile="true" GenerateMapFile="true"
@@ -379,7 +379,7 @@
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName);..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName);..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName);"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb"
GenerateMapFile="true" GenerateMapFile="true"
win/VC90/shared.vcproj
+4 -4
View File
@@ -48,7 +48,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP" AdditionalOptions="/MP"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object" AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\externals\mysql\include;..\..\src\server\game\Entities\Object"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@@ -131,7 +131,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP" AdditionalOptions="/MP"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object" AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\externals\mysql\include;..\..\src\server\game\Entities\Object"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@@ -213,7 +213,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object" AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\externals\mysql\include;..\..\src\server\game\Entities\Object"
PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -295,7 +295,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object" AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\externals\mysql\include;..\..\src\server\game\Entities\Object"
PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"