diff options
Diffstat (limited to 'win/VC71')
| -rw-r--r-- | win/VC71/mangosd.vcproj | 18 | ||||
| -rw-r--r-- | win/VC71/realmd.vcproj | 8 | ||||
| -rw-r--r-- | win/VC71/shared.vcproj | 24 |
3 files changed, 10 insertions, 40 deletions
diff --git a/win/VC71/mangosd.vcproj b/win/VC71/mangosd.vcproj index a008f365030..f7f375562de 100644 --- a/win/VC71/mangosd.vcproj +++ b/win/VC71/mangosd.vcproj @@ -23,13 +23,8 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" -<<<<<<< HEAD:win/VC71/mangosd.vcproj - AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI" -======= AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI" ->>>>>>> upstream/master:win/VC71/mangosd.vcproj StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -99,13 +94,8 @@ copy ..\..\src\trinitycore\trinitycore.conf.dist ..\..\bin\$(PlatformName)_$(Con <Tool Name="VCCLCompilerTool" Optimization="0" -<<<<<<< HEAD:win/VC71/mangosd.vcproj - AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" -======= AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" ->>>>>>> upstream/master:win/VC71/mangosd.vcproj IgnoreStandardIncludePath="FALSE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -222,14 +212,6 @@ copy ..\..\src\trinitycore\trinitycore.conf.dist ..\..\bin\$(PlatformName)_$(Con RelativePath="..\..\src\trinitycore\TrinityCore.rc"> </File> <File - RelativePath="..\..\src\shared\WheatyExceptionReport.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\WheatyExceptionReport.h" - > - </File> - <File RelativePath="..\..\src\trinitycore\WorldRunnable.cpp"> </File> <File diff --git a/win/VC71/realmd.vcproj b/win/VC71/realmd.vcproj index 10fabaf899c..dc37ff1bbbd 100644 --- a/win/VC71/realmd.vcproj +++ b/win/VC71/realmd.vcproj @@ -176,14 +176,6 @@ <File RelativePath="..\..\src\trinityrealm\TrinityRealm.rc"> </File> - <File - RelativePath="..\..\src\shared\WheatyExceptionReport.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\WheatyExceptionReport.h" - > - </File> </Files> <Globals> </Globals> diff --git a/win/VC71/shared.vcproj b/win/VC71/shared.vcproj index 1d9f80dcc3e..0737f6bfe5a 100644 --- a/win/VC71/shared.vcproj +++ b/win/VC71/shared.vcproj @@ -238,12 +238,6 @@ <Filter Name="Util"> <File - RelativePath="..\..\src\shared\Base.cpp"> - </File> - <File - RelativePath="..\..\src\shared\Base.h"> - </File> - <File RelativePath="..\..\src\shared\ByteBuffer.h"> </File> <File @@ -253,12 +247,6 @@ RelativePath="..\..\dep\include\mersennetwister\MersenneTwister.h"> </File> <File - RelativePath="..\..\src\shared\Mthread.cpp"> - </File> - <File - RelativePath="..\..\src\shared\Mthread.h"> - </File> - <File RelativePath="..\..\src\shared\ProgressBar.cpp"> </File> <File @@ -427,7 +415,7 @@ > <Tool Name="VCCustomBuildTool" - Description="Getting Version... :)" + Description="Getting Version..." CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" Outputs="revision.h" @@ -438,7 +426,7 @@ > <Tool Name="VCCustomBuildTool" - Description="Getting Version... :)" + Description="Getting Version..." CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" Outputs="revision.h" @@ -454,6 +442,14 @@ <File RelativePath="..\..\src\shared\SystemConfig.h"> </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.cpp" + > + </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.h" + > + </File> </Files> <Globals> </Globals> |