diff options
| author | Machiavelli <none@none> | 2010-06-25 01:13:58 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2010-06-25 01:13:58 +0200 |
| commit | 19f69d2badf39f126ba35cf4e0a19dfe38e1cdd5 (patch) | |
| tree | a870fd1f043dac1492d5d80ce39213ac9cf967e4 | |
| parent | c107b394211feb5e8caac69a400f1324ebdc5168 (diff) | |
| parent | 3051d245b7893ae566b7040302e12630e0aa743a (diff) | |
Merge
--HG--
branch : trunk
| -rw-r--r-- | win/TrinityCore&Script VC90.sln | 10 | ||||
| -rw-r--r-- | win/VC90/worldserver.vcproj | 8 |
2 files changed, 4 insertions, 14 deletions
diff --git a/win/TrinityCore&Script VC90.sln b/win/TrinityCore&Script VC90.sln index 1d611835132..34011c3697d 100644 --- a/win/TrinityCore&Script VC90.sln +++ b/win/TrinityCore&Script VC90.sln @@ -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 diff --git a/win/VC90/worldserver.vcproj b/win/VC90/worldserver.vcproj index 358af471057..22117ae3386 100644 --- a/win/VC90/worldserver.vcproj +++ b/win/VC90/worldserver.vcproj @@ -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)
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\lib\$(PlatformName)_$(ConfigurationName)\*.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\mysql\bin\$(PlatformName)_$(ConfigurationName)";"..\..\externals\lib\$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories=""..\..\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\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\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" /> </Configuration> </Configurations> |