diff options
| author | megamage <none@none> | 2008-12-24 11:18:01 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2008-12-24 11:18:01 -0600 |
| commit | 184b82abccfff95b18bed81ded1b5a7e98d2dbd3 (patch) | |
| tree | 4329c771076612bc55e52febfb5f323a2f21007e /win/VC80 | |
| parent | 3cb4e7c716b11f357b3265257c51e7b6cc5c36f9 (diff) | |
Backed out changeset: ad4f100c0a9d
--HG--
branch : trunk
Diffstat (limited to 'win/VC80')
| -rw-r--r-- | win/VC80/TrinityCore.vcproj (renamed from win/VC80/mangosd.vcproj) | 20 | ||||
| -rw-r--r-- | win/VC80/TrinityRealm.vcproj (renamed from win/VC80/realmd.vcproj) | 16 | ||||
| -rw-r--r-- | win/VC80/game.vcproj | 28 |
3 files changed, 0 insertions, 64 deletions
diff --git a/win/VC80/mangosd.vcproj b/win/VC80/TrinityCore.vcproj index 1bcb8a99d7a..6209bd3f9aa 100644 --- a/win/VC80/mangosd.vcproj +++ b/win/VC80/TrinityCore.vcproj @@ -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="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/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="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/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="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/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="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/VC80/mangosd.vcproj IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC80/realmd.vcproj b/win/VC80/TrinityRealm.vcproj index 9ba69e8240b..b6c91e47eb8 100644 --- a/win/VC80/realmd.vcproj +++ b/win/VC80/TrinityRealm.vcproj @@ -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="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE" -======= - PreprocessorDefinitions="VERSION="0.13.0-DEV",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="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE" -======= - PreprocessorDefinitions="VERSION="0.13.0-DEV",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="0.12.0-SVN";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE" -======= - PreprocessorDefinitions="VERSION="0.13.0-DEV";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="0.12.0-SVN";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE" -======= - PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE" ->>>>>>> upstream/master:win/VC80/realmd.vcproj IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj index 81a851d7d5f..e456ebbf235 100644 --- a/win/VC80/game.vcproj +++ b/win/VC80/game.vcproj @@ -359,14 +359,6 @@ > </File> <File - RelativePath="..\..\src\game\AchievementMgr.cpp" - > - </File> - <File - RelativePath="..\..\src\game\AchievementMgr.h" - > - </File> - <File RelativePath="..\..\src\game\AddonHandler.cpp" > </File> @@ -467,10 +459,6 @@ > </File> <File - RelativePath="..\..\src\game\CalendarHandler.cpp" - > - </File> - <File RelativePath="..\..\src\game\Cell.h" > </File> @@ -907,14 +895,6 @@ > </File> <File - RelativePath="..\..\src\game\Calendar.cpp" - > - </File> - <File - RelativePath="..\..\src\game\Calendar.h" - > - </File> - <File RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp" > </File> @@ -1275,14 +1255,6 @@ > </File> <File - RelativePath="..\..\src\game\Vehicle.cpp" - > - </File> - <File - RelativePath="..\..\src\game\Vehicle.h" - > - </File> - <File RelativePath="..\..\src\game\WaypointMovementGenerator.cpp" > </File> |