josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removed unused/unneeded classes: Base, Mthread

Browse Source 
* Fixed a merge issue that broke VC71 files.
* Moved WheatyExceptionReport to shared, where it should be.

--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2009-03-19 15:32:16 +01:00
parent 3ff11b64ba
commit a075d37fdd
15 changed files with 34 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/VC71/mangosd.vcproj
-18
View File
@@ -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=&quot;0.12.0-SVN&quot;;WIN32;NDEBUG;_CONSOLE;ENABLE_CLI"
=======
AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="VERSION=&quot;0.13.0-DEV&quot;;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=&quot;0.12.0-SVN&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI"
=======
AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="VERSION=&quot;0.13.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI"
>>>>>>> upstream/master:win/VC71/mangosd.vcproj
IgnoreStandardIncludePath="FALSE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -221,14 +211,6 @@ copy ..\..\src\trinitycore\trinitycore.conf.dist ..\..\bin\$(PlatformName)_$(Con
<File
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>