diff options
| author | Xanadu <none@none> | 2010-06-25 06:57:32 +0200 |
|---|---|---|
| committer | Xanadu <none@none> | 2010-06-25 06:57:32 +0200 |
| commit | eb79fb91a6eb410a5a5ceb6259b9d4bc5569c2ae (patch) | |
| tree | 89ff7f3c70ae1c0c59737f2616e377efff8c003b | |
| parent | d54b534dca7d65c19db549194c288e26049ff22d (diff) | |
Now that we know how to build mysql lib from sources on Win x64 thanks to Scazzato88, we can as well do it. Closes issue #2803.
Use with 8722_openssl_libs.zip from the download section, for details see the forum.
--HG--
branch : trunk
| -rw-r--r-- | externals/mysql/win/VC90/libmysql.vcproj | 10 | ||||
| -rw-r--r-- | win/TrinityCore&Script VC90.sln | 2 | ||||
| -rw-r--r-- | win/VC90/worldserver.vcproj | 12 |
3 files changed, 14 insertions, 10 deletions
diff --git a/externals/mysql/win/VC90/libmysql.vcproj b/externals/mysql/win/VC90/libmysql.vcproj index 05129673111..4534e1ab1af 100644 --- a/externals/mysql/win/VC90/libmysql.vcproj +++ b/externals/mysql/win/VC90/libmysql.vcproj @@ -84,7 +84,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="false" - AdditionalOptions=" /STACK:10000000 /machine:X86 /debug" + AdditionalOptions=" /STACK:10000000" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib $(NOINHERIT)" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).dll" Version="16.0" @@ -96,6 +96,7 @@ RandomizedBaseAddress="0" DataExecutionPrevention="0" ImportLibrary="" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -186,7 +187,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="false" - AdditionalOptions=" /STACK:10000000 /machine:X86 /debug" + AdditionalOptions=" /STACK:10000000" AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib " OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).dll" Version="16.0" @@ -288,7 +289,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="false" - AdditionalOptions=" /STACK:10000000 /machine:X86" + AdditionalOptions=" /STACK:10000000" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib $(NOINHERIT)" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).dll" Version="16.0" @@ -300,6 +301,7 @@ RandomizedBaseAddress="0" DataExecutionPrevention="0" ImportLibrary="" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -391,7 +393,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="false" - AdditionalOptions=" /STACK:10000000 /machine:X86" + AdditionalOptions=" /STACK:10000000" AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib " OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).dll" Version="16.0" diff --git a/win/TrinityCore&Script VC90.sln b/win/TrinityCore&Script VC90.sln index 34011c3697d..4e82f96bae6 100644 --- a/win/TrinityCore&Script VC90.sln +++ b/win/TrinityCore&Script VC90.sln @@ -107,9 +107,11 @@ Global {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|x64 + {4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|x64.Build.0 = Debug|x64 {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|x64 + {4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|x64.Build.0 = Release|x64 {563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32 {563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32 {563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/win/VC90/worldserver.vcproj b/win/VC90/worldserver.vcproj index 22117ae3386..40b5966a7a3 100644 --- a/win/VC90/worldserver.vcproj +++ b/win/VC90/worldserver.vcproj @@ -117,7 +117,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" + CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)" /> </Configuration> <Configuration @@ -185,7 +185,7 @@ OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\externals\lib\$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories=""..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)";"..\..\externals\lib\$(PlatformName)_$(ConfigurationName)"" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb" GenerateMapFile="true" @@ -217,7 +217,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" + CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)" /> </Configuration> <Configuration @@ -319,7 +319,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" + CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)" /> </Configuration> <Configuration @@ -389,7 +389,7 @@ Version="" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\externals\lib\$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories=""..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)";"..\..\externals\lib\$(PlatformName)_$(ConfigurationName)"" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb" GenerateMapFile="true" @@ -421,7 +421,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" + CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)" /> </Configuration> </Configurations> |