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

*Fix build in VC80.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2008-12-24 13:39:00 -06:00
parent 7ef94fd173
commit 10a0e30e59
4 changed files with 29 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/TrinityCore&Script VC80.sln
+2 -2
View File
@@ -24,7 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC80\g3dlite.vcp
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "VC80\sockets.vcproj", "{04BAF755-0D67-46F8-B1C6-77AE5368F3CB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityCore", "VC80\TrinityCore.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityCore", "VC80\mangosd.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
ProjectSection(ProjectDependencies) = postProject
{563E9905-3657-460C-AE63-0AC39D162E23} = {563E9905-3657-460C-AE63-0AC39D162E23}
{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
@@ -32,7 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityCore", "VC80\Trinity
{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityRealm", "VC80\TrinityRealm.vcproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityRealm", "VC80\realmd.vcproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
ProjectSection(ProjectDependencies) = postProject
{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
{04BAF755-0D67-46F8-B1C6-77AE5368F3CB} = {04BAF755-0D67-46F8-B1C6-77AE5368F3CB}
win/VC80/game.vcproj
+10 -14
View File
@@ -52,7 +52,6 @@
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
FloatingPointModel="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
@@ -126,7 +125,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalOptions="/MP /bigobj"
Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
@@ -134,7 +133,6 @@
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
FloatingPointModel="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
@@ -215,7 +213,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="1"
FloatingPointModel="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
@@ -289,7 +286,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalOptions="/MP /bigobj"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
@@ -297,7 +294,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="0"
FloatingPointModel="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
@@ -638,14 +634,6 @@
RelativePath="..\..\src\game\MapManager.h"
>
</File>
<File
RelativePath="..\..\src\game\MapReference.h"
>
</File>
<File
RelativePath="..\..\src\game\MapRefManager.h"
>
</File>
<File
RelativePath="..\..\src\game\MiscHandler.cpp"
>
@@ -1430,6 +1418,14 @@
RelativePath="..\..\src\game\HostilRefManager.h"
>
</File>
<File
RelativePath="..\..\src\game\MapReference.h"
>
</File>
<File
RelativePath="..\..\src\game\MapRefManager.h"
>
</File>
<File
RelativePath="..\..\src\game\ThreatManager.cpp"
>
win/VC80/mangosd.vcproj
+10 -34
View File
@@ -47,13 +47,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
<<<<<<< HEAD:win/VC80/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/VC80/mangosd.vcproj
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -154,13 +149,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
<<<<<<< HEAD:win/VC80/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/VC80/mangosd.vcproj
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -259,13 +249,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
<<<<<<< HEAD:win/VC80/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/VC80/mangosd.vcproj
IgnoreStandardIncludePath="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -366,13 +351,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
<<<<<<< HEAD:win/VC80/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/VC80/mangosd.vcproj
IgnoreStandardIncludePath="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -478,39 +458,35 @@
</File>
</Filter>
<File
RelativePath="..\..\src\trinitycore\CliRunnable.cpp"
RelativePath="..\..\src\mangosd\CliRunnable.cpp"
>
</File>
<File
RelativePath="..\..\src\trinitycore\CliRunnable.h"
RelativePath="..\..\src\mangosd\CliRunnable.h"
>
</File>
<File
RelativePath="..\..\src\trinitycore\Main.cpp"
RelativePath="..\..\src\mangosd\Main.cpp"
>
</File>
<File
RelativePath="..\..\src\trinitycore\Master.cpp"
RelativePath="..\..\src\mangosd\mangosd.rc"
>
</File>
<File
RelativePath="..\..\src\trinitycore\Master.h"
RelativePath="..\..\src\mangosd\Master.cpp"
>
</File>
<File
RelativePath="..\..\src\trinitycore\RASocket.cpp"
RelativePath="..\..\src\mangosd\Master.h"
>
</File>
<File
RelativePath="..\..\src\trinitycore\RASocket.h"
RelativePath="..\..\src\mangosd\RASocket.cpp"
>
</File>
<File
RelativePath="..\..\src\trinitycore\resource.h"
>
</File>
<File
RelativePath="..\..\src\trinitycore\TrinityCore.rc"
RelativePath="..\..\src\mangosd\RASocket.h"
>
</File>
<File
@@ -522,11 +498,11 @@
>
</File>
<File
RelativePath="..\..\src\trinitycore\WorldRunnable.cpp"
RelativePath="..\..\src\mangosd\WorldRunnable.cpp"
>
</File>
<File
RelativePath="..\..\src\trinitycore\WorldRunnable.h"
RelativePath="..\..\src\mangosd\WorldRunnable.h"
>
</File>
</Files>
win/VC80/realmd.vcproj
+7 -27
View File
@@ -48,11 +48,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
<<<<<<< HEAD:win/VC80/realmd.vcproj
PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;,WIN32,NDEBUG,_CONSOLE"
=======
PreprocessorDefinitions="VERSION=&quot;0.13.0-DEV&quot;,WIN32,NDEBUG,_CONSOLE"
>>>>>>> upstream/master:win/VC80/realmd.vcproj
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -152,11 +148,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
<<<<<<< HEAD:win/VC80/realmd.vcproj
PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;,WIN32,NDEBUG,_CONSOLE"
=======
PreprocessorDefinitions="VERSION=&quot;0.13.0-DEV&quot;,WIN32,NDEBUG,_CONSOLE"
>>>>>>> upstream/master:win/VC80/realmd.vcproj
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -254,11 +246,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
<<<<<<< HEAD:win/VC80/realmd.vcproj
PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE"
=======
PreprocessorDefinitions="VERSION=&quot;0.13.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE"
>>>>>>> upstream/master:win/VC80/realmd.vcproj
IgnoreStandardIncludePath="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -358,11 +346,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
<<<<<<< HEAD:win/VC80/realmd.vcproj
PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE"
=======
PreprocessorDefinitions="VERSION=&quot;0.13.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE"
>>>>>>> upstream/master:win/VC80/realmd.vcproj
IgnoreStandardIncludePath="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -434,35 +418,31 @@
</References>
<Files>
<File
RelativePath="..\..\src\trinityrealm\AuthCodes.h"
RelativePath="..\..\src\realmd\AuthCodes.h"
>
</File>
<File
RelativePath="..\..\src\trinityrealm\AuthSocket.cpp"
RelativePath="..\..\src\realmd\AuthSocket.cpp"
>
</File>
<File
RelativePath="..\..\src\trinityrealm\AuthSocket.h"
RelativePath="..\..\src\realmd\AuthSocket.h"
>
</File>
<File
RelativePath="..\..\src\trinityrealm\Main.cpp"
RelativePath="..\..\src\realmd\Main.cpp"
>
</File>
<File
RelativePath="..\..\src\trinityrealm\RealmList.cpp"
RelativePath="..\..\src\realmd\realmd.rc"
>
</File>
<File
RelativePath="..\..\src\trinityrealm\RealmList.h"
RelativePath="..\..\src\realmd\RealmList.cpp"
>
</File>
<File
RelativePath="..\..\src\trinityrealm\resource.h"
>
</File>
<File
RelativePath="..\..\src\trinityrealm\TrinityRealm.rc"
RelativePath="..\..\src\realmd\RealmList.h"
>
</File>
<File