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/VC71 | |
| parent | 3cb4e7c716b11f357b3265257c51e7b6cc5c36f9 (diff) | |
Backed out changeset: ad4f100c0a9d
--HG--
branch : trunk
Diffstat (limited to 'win/VC71')
| -rw-r--r-- | win/VC71/TrinityCore.vcproj (renamed from win/VC71/mangosd.vcproj) | 10 | ||||
| -rw-r--r-- | win/VC71/TrinityRealm.vcproj (renamed from win/VC71/realmd.vcproj) | 8 | ||||
| -rw-r--r-- | win/VC71/game.vcproj | 23 |
3 files changed, 0 insertions, 41 deletions
diff --git a/win/VC71/mangosd.vcproj b/win/VC71/TrinityCore.vcproj index a008f365030..03ef53ab66c 100644 --- a/win/VC71/mangosd.vcproj +++ b/win/VC71/TrinityCore.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" diff --git a/win/VC71/realmd.vcproj b/win/VC71/TrinityRealm.vcproj index f8ae9d10542..02f8993705d 100644 --- a/win/VC71/realmd.vcproj +++ b/win/VC71/TrinityRealm.vcproj @@ -24,11 +24,7 @@ Name="VCCLCompilerTool" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" -<<<<<<< HEAD:win/VC71/realmd.vcproj PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE" -======= - PreprocessorDefinitions="VERSION="0.13.0-DEV",WIN32,NDEBUG,_CONSOLE" ->>>>>>> upstream/master:win/VC71/realmd.vcproj StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -96,11 +92,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" -<<<<<<< HEAD:win/VC71/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/VC71/realmd.vcproj IgnoreStandardIncludePath="FALSE" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC71/game.vcproj b/win/VC71/game.vcproj index 010e2d8bc0b..923845a7612 100644 --- a/win/VC71/game.vcproj +++ b/win/VC71/game.vcproj @@ -136,14 +136,6 @@ RelativePath="..\..\src\game\AccountMgr.h"> </File> <File - RelativePath="..\..\src\game\AchievementMgr.cpp"> - - </File> - <File - RelativePath="..\..\src\game\AchievementMgr.h"> - - </File> - <File RelativePath="..\..\src\game\AddonHandler.cpp"> </File> <File @@ -219,9 +211,6 @@ RelativePath="..\..\src\game\BattleGroundWS.h"> </File> <File - RelativePath="..\..\src\game\CalendarHandler.cpp"> - </File> - <File RelativePath="..\..\src\game\Cell.h"> </File> <File @@ -565,12 +554,6 @@ RelativePath="..\..\src\game\Bag.h"> </File> <File - RelativePath="..\..\src\game\Calendar.cpp"> - </File> - <File - RelativePath="..\..\src\game\Calendar.h"> - </File> - <File RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp"> </File> <File @@ -845,12 +828,6 @@ RelativePath="..\..\src\game\UpdateMask.h"> </File> <File - RelativePath="..\..\src\game\Vehicle.cpp"> - </File> - <File - RelativePath="..\..\src\game\Vehicle.h"> - </File> - <File RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"> </File> <File |