diff options
Diffstat (limited to 'win/VC71/mangosd.vcproj')
| -rw-r--r-- | win/VC71/mangosd.vcproj | 18 |
1 files changed, 0 insertions, 18 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 |