Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-06-25 01:13:58 +02:00
parent c107b39421 3051d245b7
commit 19f69d2bad
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
win/TrinityCore&Script VC90.sln
View File

@@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmysql", "..\externals\my
{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{FAC6B1DA-4242-4891-81CB-F366A8FC655F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "authserver", "VC90\authserver.vcproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
ProjectSection(ProjectDependencies) = postProject
{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
@@ -109,11 +107,9 @@ 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
@@ -134,12 +130,6 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
{BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
EndGlobalSection
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
EndGlobalSection

8
win/VC90/worldserver.vcproj
View File

@@ -185,7 +185,7 @@
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)";"..\..\externals\lib\$(PlatformName)_$(ConfigurationName)""
AdditionalLibraryDirectories=""..\..\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)&#x0D;&#x0A;copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@@ -389,7 +389,7 @@
Version=""
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)&quot;;&quot;..\..\externals\lib\$(PlatformName)_$(ConfigurationName)&quot;"
AdditionalLibraryDirectories="&quot;..\..\externals\lib\$(PlatformName)_$(ConfigurationName)&quot;"
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)&#x0D;&#x0A;copy ..\..\externals\mysql\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\libeay32.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>