From 30703e33e28ebc11e3b2db82acc63ee69f99ca4b Mon Sep 17 00:00:00 2001 From: billy1arm Date: Fri, 28 Jun 2013 09:21:38 +0100 Subject: [PATCH] [m12650] Sync'd vs project files with zero --- src/shared/revision_nr.h | 2 +- win/VC100/ACE_vc10.vcxproj | 2 +- win/VC100/Precompiled Headers.props | 11 +++ win/VC100/g3dlite.vcxproj | 8 +- win/VC100/g3dlite.vcxproj.filters | 20 +++- win/VC100/game.vcxproj | 55 +++++------ win/VC100/game.vcxproj.filters | 18 ++++ win/VC100/genrevision.vcxproj | 2 +- win/VC100/mangosd.vcxproj | 26 ++--- win/VC100/realmd.vcxproj | 64 +++++++++---- win/VC100/script.vcxproj | 2 +- win/VC100/tbb.vcxproj | 14 ++- win/VC100/tbbmalloc.vcxproj | 14 ++- win/VC100/zlib.vcxproj | 2 +- win/VC110/ACE_vc11.vcxproj | 1 - win/VC110/Precompiled Headers.props | 11 +++ win/VC110/bzip2.vcxproj | 4 +- win/VC110/framework.vcxproj | 1 - win/VC110/g3dlite.vcxproj | 7 +- win/VC110/g3dlite.vcxproj.filters | 20 +++- win/VC110/game.vcxproj | 103 ++++++++++---------- win/VC110/game.vcxproj.filters | 141 ++++++++++++++++------------ win/VC110/genrevision.vcxproj | 1 - win/VC110/mangosd.vcxproj | 25 +++-- win/VC110/realmd.vcxproj | 63 +++++++++---- win/VC110/script.vcxproj | 2 +- win/VC110/shared.vcxproj | 2 - win/VC110/shared.vcxproj.filters | 12 +-- win/VC110/tbb.vcxproj | 14 ++- win/VC110/tbbmalloc.vcxproj | 14 ++- win/VC110/zlib.vcxproj | 1 - win/copyfiles.cmd | 35 +++++++ 32 files changed, 458 insertions(+), 239 deletions(-) create mode 100644 win/VC100/Precompiled Headers.props create mode 100644 win/VC110/Precompiled Headers.props create mode 100644 win/copyfiles.cmd diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 9b5b4c3b5..a74f1d995 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12649" + #define REVISION_NR "12650" #endif // __REVISION_NR_H__ diff --git a/win/VC100/ACE_vc10.vcxproj b/win/VC100/ACE_vc10.vcxproj index 519755476..4d794f908 100644 --- a/win/VC100/ACE_vc10.vcxproj +++ b/win/VC100/ACE_vc10.vcxproj @@ -1581,4 +1581,4 @@ - \ No newline at end of file + diff --git a/win/VC100/Precompiled Headers.props b/win/VC100/Precompiled Headers.props new file mode 100644 index 000000000..30767bb21 --- /dev/null +++ b/win/VC100/Precompiled Headers.props @@ -0,0 +1,11 @@ + + + + + Use + pchdef.h + pchdef.h;%(ForcedIncludeFiles) + /Zm300 %(AdditionalOptions) + + + diff --git a/win/VC100/g3dlite.vcxproj b/win/VC100/g3dlite.vcxproj index 7b4b753a2..c91beabec 100644 --- a/win/VC100/g3dlite.vcxproj +++ b/win/VC100/g3dlite.vcxproj @@ -317,6 +317,9 @@ + + + @@ -346,8 +349,11 @@ + + + - \ No newline at end of file + diff --git a/win/VC100/g3dlite.vcxproj.filters b/win/VC100/g3dlite.vcxproj.filters index a7836a99f..a65cb2e5f 100644 --- a/win/VC100/g3dlite.vcxproj.filters +++ b/win/VC100/g3dlite.vcxproj.filters @@ -92,6 +92,15 @@ Header Files + + Header Files + + + Header Files + + + Header Files + @@ -211,5 +220,14 @@ Source Files + + Source Files + + + Source Files + + + Source Files + - \ No newline at end of file + diff --git a/win/VC100/game.vcxproj b/win/VC100/game.vcxproj index 2a42e08ad..19bda2d22 100644 --- a/win/VC100/game.vcxproj +++ b/win/VC100/game.vcxproj @@ -92,6 +92,18 @@ + + + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 @@ -134,7 +146,6 @@ - /Zm300 %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories) WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions) @@ -143,9 +154,6 @@ MultiThreadedDebugDLL true true - Use - pchdef.h - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -153,8 +161,8 @@ true ProgramDatabase Cdecl - pchdef.h;%(ForcedIncludeFiles) true + /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -171,7 +179,7 @@ X64 - /bigobj /Zm300 %(AdditionalOptions) + /bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories) WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions) @@ -180,9 +188,6 @@ MultiThreadedDebugDLL true true - Use - pchdef.h - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -190,7 +195,6 @@ true ProgramDatabase Cdecl - pchdef.h;%(ForcedIncludeFiles) true @@ -205,7 +209,6 @@ - /Zm300 %(AdditionalOptions) OnlyExplicitInline ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) @@ -214,9 +217,6 @@ true StreamingSIMDExtensions true - Use - pchdef.h - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -224,8 +224,8 @@ true ProgramDatabase Cdecl - pchdef.h;%(ForcedIncludeFiles) true + /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -242,7 +242,7 @@ X64 - /bigobj /Zm300 %(AdditionalOptions) + /bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) OnlyExplicitInline ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) @@ -251,9 +251,6 @@ true NotSet true - Use - pchdef.h - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -261,7 +258,6 @@ true ProgramDatabase Cdecl - pchdef.h;%(ForcedIncludeFiles) true @@ -284,9 +280,6 @@ MultiThreadedDebugDLL true true - - - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -295,6 +288,7 @@ ProgramDatabase Cdecl true + /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -311,7 +305,7 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories) WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions) @@ -320,9 +314,6 @@ MultiThreadedDebugDLL true true - - - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -453,13 +444,9 @@ Create - pchdef.h Create - pchdef.h Create - pchdef.h Create - pchdef.h @@ -519,6 +506,8 @@ + + @@ -685,9 +674,13 @@ + + + + diff --git a/win/VC100/game.vcxproj.filters b/win/VC100/game.vcxproj.filters index e13e0ec01..b3cf5a080 100644 --- a/win/VC100/game.vcxproj.filters +++ b/win/VC100/game.vcxproj.filters @@ -466,6 +466,12 @@ vmaps + + vmaps + + + vmaps + vmaps @@ -943,6 +949,15 @@ vmaps + + vmaps + + + vmaps + + + vmaps + vmaps @@ -952,6 +967,9 @@ vmaps + + vmaps + vmaps diff --git a/win/VC100/genrevision.vcxproj b/win/VC100/genrevision.vcxproj index 4783cc417..c64faab05 100644 --- a/win/VC100/genrevision.vcxproj +++ b/win/VC100/genrevision.vcxproj @@ -267,4 +267,4 @@ - \ No newline at end of file + diff --git a/win/VC100/mangosd.vcxproj b/win/VC100/mangosd.vcxproj index 9758febac..826d70d87 100644 --- a/win/VC100/mangosd.vcxproj +++ b/win/VC100/mangosd.vcxproj @@ -152,7 +152,7 @@ /MP %(AdditionalOptions) OnlyExplicitInline ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -190,7 +190,7 @@ $(IntDir)mangosd.lib - copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration) @@ -202,7 +202,7 @@ /MP %(AdditionalOptions) OnlyExplicitInline ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -239,7 +239,7 @@ MachineX64 - copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration) @@ -250,7 +250,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -289,7 +289,7 @@ $(IntDir)mangosd.lib - copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration) @@ -301,7 +301,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -339,7 +339,7 @@ MachineX64 - copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration) @@ -350,7 +350,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -389,7 +389,7 @@ $(IntDir)mangosd.lib - copy ..\..\dep\lib\$(Platform)_debug\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_debug ..\..\bin\$(Platform)_$(Configuration) @@ -401,7 +401,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -439,7 +439,7 @@ MachineX64 - copy ..\..\dep\lib\$(Platform)_debug\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_debug ..\..\bin\$(Platform)_$(Configuration) @@ -495,4 +495,4 @@ - \ No newline at end of file + diff --git a/win/VC100/realmd.vcxproj b/win/VC100/realmd.vcxproj index 06403e50c..73eb1ad95 100644 --- a/win/VC100/realmd.vcxproj +++ b/win/VC100/realmd.vcxproj @@ -152,7 +152,7 @@ /MP %(AdditionalOptions) OnlyExplicitInline ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -174,9 +174,9 @@ /MACHINE:I386 %(AdditionalOptions) - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies) true - ..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -186,6 +186,9 @@ + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + @@ -196,7 +199,7 @@ /MP %(AdditionalOptions) OnlyExplicitInline ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -217,9 +220,9 @@ 0x0409 - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies) true - ..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -229,6 +232,9 @@ MachineX64 + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + @@ -238,7 +244,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -260,9 +266,11 @@ /MACHINE:I386 %(AdditionalOptions) - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies) + + true - ..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -273,6 +281,9 @@ + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + @@ -283,7 +294,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -304,9 +315,11 @@ 0x0409 - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies) + + true - ..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -317,6 +330,9 @@ MachineX64 + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + @@ -326,7 +342,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -348,9 +364,11 @@ /MACHINE:I386 %(AdditionalOptions) - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies) + + true - ..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -361,6 +379,9 @@ + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + @@ -371,7 +392,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -392,9 +413,11 @@ 0x0409 - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies) + + true - ..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -405,6 +428,9 @@ MachineX64 + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + @@ -433,4 +459,4 @@ - \ No newline at end of file + diff --git a/win/VC100/script.vcxproj b/win/VC100/script.vcxproj index e47d79a4c..60b286254 100644 --- a/win/VC100/script.vcxproj +++ b/win/VC100/script.vcxproj @@ -334,4 +334,4 @@ - \ No newline at end of file + diff --git a/win/VC100/tbb.vcxproj b/win/VC100/tbb.vcxproj index bafaca65d..fbf2d2f09 100644 --- a/win/VC100/tbb.vcxproj +++ b/win/VC100/tbb.vcxproj @@ -285,6 +285,12 @@ /coff /Zi true /coff /Zi + true + true + true + true + true + true true @@ -311,6 +317,12 @@ /coff /Zi true /coff /Zi + true + true + true + true + true + true @@ -477,4 +489,4 @@ - \ No newline at end of file + diff --git a/win/VC100/tbbmalloc.vcxproj b/win/VC100/tbbmalloc.vcxproj index 1470edb15..7af17fe3b 100644 --- a/win/VC100/tbbmalloc.vcxproj +++ b/win/VC100/tbbmalloc.vcxproj @@ -314,6 +314,12 @@ /coff /Zi true /coff /Zi + true + true + true + true + true + true /coff /Zi @@ -323,6 +329,12 @@ /coff /Zi true /coff /Zi + true + true + true + true + true + true @@ -447,4 +459,4 @@ - \ No newline at end of file + diff --git a/win/VC100/zlib.vcxproj b/win/VC100/zlib.vcxproj index a6f4f7ac1..b81fe8996 100644 --- a/win/VC100/zlib.vcxproj +++ b/win/VC100/zlib.vcxproj @@ -275,4 +275,4 @@ - \ No newline at end of file + diff --git a/win/VC110/ACE_vc11.vcxproj b/win/VC110/ACE_vc11.vcxproj index 5d74893c4..a21a77cef 100644 --- a/win/VC110/ACE_vc11.vcxproj +++ b/win/VC110/ACE_vc11.vcxproj @@ -55,7 +55,6 @@ {BD537C9A-FECA-1BAD-6757-8A6348EA12C8} ACE Win32Proj - $(VCTargetsPath11) diff --git a/win/VC110/Precompiled Headers.props b/win/VC110/Precompiled Headers.props new file mode 100644 index 000000000..30767bb21 --- /dev/null +++ b/win/VC110/Precompiled Headers.props @@ -0,0 +1,11 @@ + + + + + Use + pchdef.h + pchdef.h;%(ForcedIncludeFiles) + /Zm300 %(AdditionalOptions) + + + diff --git a/win/VC110/bzip2.vcxproj b/win/VC110/bzip2.vcxproj index 72fdf8429..7bedf4730 100644 --- a/win/VC110/bzip2.vcxproj +++ b/win/VC110/bzip2.vcxproj @@ -19,10 +19,12 @@ StaticLibrary Unicode true + v110 StaticLibrary Unicode + v110 @@ -82,4 +84,4 @@ - + \ No newline at end of file diff --git a/win/VC110/framework.vcxproj b/win/VC110/framework.vcxproj index 7eb19261d..9316783f7 100644 --- a/win/VC110/framework.vcxproj +++ b/win/VC110/framework.vcxproj @@ -54,7 +54,6 @@ {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} framework Win32Proj - $(VCTargetsPath11) diff --git a/win/VC110/g3dlite.vcxproj b/win/VC110/g3dlite.vcxproj index 3addad948..a9fba2d30 100644 --- a/win/VC110/g3dlite.vcxproj +++ b/win/VC110/g3dlite.vcxproj @@ -54,7 +54,6 @@ {8072769E-CF10-48BF-B9E1-12752A5DAC6E} sockets Win32Proj - $(VCTargetsPath11) @@ -324,6 +323,9 @@ + + + @@ -353,6 +355,9 @@ + + + diff --git a/win/VC110/g3dlite.vcxproj.filters b/win/VC110/g3dlite.vcxproj.filters index a7836a99f..a65cb2e5f 100644 --- a/win/VC110/g3dlite.vcxproj.filters +++ b/win/VC110/g3dlite.vcxproj.filters @@ -92,6 +92,15 @@ Header Files + + Header Files + + + Header Files + + + Header Files + @@ -211,5 +220,14 @@ Source Files + + Source Files + + + Source Files + + + Source Files + - \ No newline at end of file + diff --git a/win/VC110/game.vcxproj b/win/VC110/game.vcxproj index 743057d8d..92b8e2eec 100644 --- a/win/VC110/game.vcxproj +++ b/win/VC110/game.vcxproj @@ -54,7 +54,6 @@ {1DC6C4DA-A028-41F3-877D-D5400C594F88} game Win32Proj - $(VCTargetsPath11) @@ -99,6 +98,18 @@ + + + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 @@ -141,7 +152,6 @@ - /Zm300 %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories) WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions) @@ -150,9 +160,6 @@ MultiThreadedDebugDLL true true - Use - pchdef.h - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -160,8 +167,8 @@ true ProgramDatabase Cdecl - pchdef.h;%(ForcedIncludeFiles) true + /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -178,18 +185,15 @@ X64 - /bigobj /Zm300 %(AdditionalOptions) + /bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) Disabled - ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories) + ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories) WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL true true - Use - pchdef.h - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -197,7 +201,6 @@ true ProgramDatabase Cdecl - pchdef.h;%(ForcedIncludeFiles) true @@ -212,7 +215,6 @@ - /Zm300 %(AdditionalOptions) OnlyExplicitInline ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) @@ -221,9 +223,6 @@ true StreamingSIMDExtensions true - Use - pchdef.h - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -231,8 +230,8 @@ true ProgramDatabase Cdecl - pchdef.h;%(ForcedIncludeFiles) true + /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -249,18 +248,15 @@ X64 - /bigobj /Zm300 %(AdditionalOptions) + /bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) OnlyExplicitInline - ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories) + ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreadedDLL true NotSet true - Use - pchdef.h - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -268,7 +264,6 @@ true ProgramDatabase Cdecl - pchdef.h;%(ForcedIncludeFiles) true @@ -291,9 +286,6 @@ MultiThreadedDebugDLL true true - - - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -302,6 +294,7 @@ ProgramDatabase Cdecl true + /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -318,18 +311,15 @@ X64 - /bigobj %(AdditionalOptions) + /bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions) Disabled - ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories) + ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories) WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL true true - - - .\game__$(Platform)_$(Configuration)\game.pch .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ .\game__$(Platform)_$(Configuration)\ @@ -362,6 +352,7 @@ + @@ -370,7 +361,6 @@ - @@ -457,25 +447,12 @@ - - - - - - - - - Create - pchdef.h Create - pchdef.h Create - pchdef.h Create - pchdef.h @@ -516,15 +493,27 @@ + + + + + + + + + + + + @@ -543,6 +532,7 @@ + @@ -550,7 +540,6 @@ - @@ -638,15 +627,6 @@ - - - - - - - - - @@ -687,13 +667,26 @@ + + + + + + + + + + + + + diff --git a/win/VC110/game.vcxproj.filters b/win/VC110/game.vcxproj.filters index 05ed9ae40..b3cf5a080 100644 --- a/win/VC110/game.vcxproj.filters +++ b/win/VC110/game.vcxproj.filters @@ -32,10 +32,10 @@ {0ac140f9-89c1-4830-b673-514c5e8b4d37} - {7d020a20-502d-49d3-8aa4-bd5e905571c5} + {c25f76ed-c7d6-495a-a647-1f97b1261fa7} - {57de5e8a-b022-4453-bd5e-d4f04553f78a} + {0af4d063-6d01-4546-a429-59bd828ab270} @@ -204,6 +204,9 @@ World/Handlers + + World/Handlers + World/Handlers @@ -216,6 +219,33 @@ World/Handlers + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + Motion generators @@ -436,6 +466,12 @@ vmaps + + vmaps + + + vmaps + vmaps @@ -475,33 +511,6 @@ Server - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - Object @@ -669,6 +678,33 @@ World/Handlers + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + + + OutdoorPvP + Motion generators @@ -913,6 +949,15 @@ vmaps + + vmaps + + + vmaps + + + vmaps + vmaps @@ -922,6 +967,9 @@ vmaps + + vmaps + vmaps @@ -979,36 +1027,12 @@ Server - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - - - OutdoorPvP - Object + + BattleGround + BattleGround @@ -1051,8 +1075,5 @@ BattleGround - - BattleGround - - \ No newline at end of file + diff --git a/win/VC110/genrevision.vcxproj b/win/VC110/genrevision.vcxproj index 8b6474d8d..332439a0c 100644 --- a/win/VC110/genrevision.vcxproj +++ b/win/VC110/genrevision.vcxproj @@ -54,7 +54,6 @@ {803F488E-4C5A-4866-8D5C-1E6C03C007C2} genrevision Win32Proj - $(VCTargetsPath11) diff --git a/win/VC110/mangosd.vcxproj b/win/VC110/mangosd.vcxproj index 2c9d1d1e6..551d9d1db 100644 --- a/win/VC110/mangosd.vcxproj +++ b/win/VC110/mangosd.vcxproj @@ -54,7 +54,6 @@ {A3A04E47-43A2-4C08-90B3-029CEF558594} mangosd Win32Proj - $(VCTargetsPath11) @@ -159,7 +158,7 @@ /MP %(AdditionalOptions) OnlyExplicitInline ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -197,7 +196,7 @@ $(IntDir)mangosd.lib - copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration) @@ -209,7 +208,7 @@ /MP %(AdditionalOptions) OnlyExplicitInline ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -246,7 +245,7 @@ MachineX64 - copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration) @@ -257,7 +256,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -296,7 +295,7 @@ $(IntDir)mangosd.lib - copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration) @@ -308,7 +307,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -346,7 +345,7 @@ MachineX64 - copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration) @@ -357,7 +356,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -396,7 +395,7 @@ $(IntDir)mangosd.lib - copy ..\..\dep\lib\$(Platform)_debug\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_debug ..\..\bin\$(Platform)_$(Configuration) @@ -408,7 +407,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -446,7 +445,7 @@ MachineX64 - copy ..\..\dep\lib\$(Platform)_debug\*.dll ..\..\bin\$(Platform)_$(Configuration) + ..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_debug ..\..\bin\$(Platform)_$(Configuration) diff --git a/win/VC110/realmd.vcxproj b/win/VC110/realmd.vcxproj index d040a2ec7..d86dafc15 100644 --- a/win/VC110/realmd.vcxproj +++ b/win/VC110/realmd.vcxproj @@ -54,7 +54,6 @@ {563E9905-3657-460C-AE63-0AC39D162E23} realmd Win32Proj - $(VCTargetsPath11) @@ -159,7 +158,7 @@ /MP %(AdditionalOptions) OnlyExplicitInline ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -181,9 +180,9 @@ /MACHINE:I386 %(AdditionalOptions) - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies) true - ..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -193,6 +192,9 @@ + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + @@ -203,7 +205,7 @@ /MP %(AdditionalOptions) OnlyExplicitInline ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -224,9 +226,9 @@ 0x0409 - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies) true - ..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -236,6 +238,9 @@ MachineX64 + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + @@ -245,7 +250,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -267,9 +272,11 @@ /MACHINE:I386 %(AdditionalOptions) - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies) + + true - ..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -280,6 +287,9 @@ + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + @@ -290,7 +300,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -311,9 +321,11 @@ 0x0409 - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies) + + true - ..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -324,6 +336,9 @@ MachineX64 + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + @@ -333,7 +348,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -355,9 +370,11 @@ /MACHINE:I386 %(AdditionalOptions) - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies) + + true - ..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -368,6 +385,9 @@ + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + @@ -378,7 +398,7 @@ /MP %(AdditionalOptions) Disabled ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -399,9 +419,11 @@ 0x0409 - libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies) + libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies) + + true - ..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories) + ..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) true $(TargetDir)$(TargetName).pdb $(TargetDir)$(TargetName).map @@ -412,6 +434,9 @@ MachineX64 + + copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration) + diff --git a/win/VC110/script.vcxproj b/win/VC110/script.vcxproj index e47d79a4c..60b286254 100644 --- a/win/VC110/script.vcxproj +++ b/win/VC110/script.vcxproj @@ -334,4 +334,4 @@ - \ No newline at end of file + diff --git a/win/VC110/shared.vcxproj b/win/VC110/shared.vcxproj index fc2f311a4..fce765a5d 100644 --- a/win/VC110/shared.vcxproj +++ b/win/VC110/shared.vcxproj @@ -54,7 +54,6 @@ {90297C34-F231-4DF4-848E-A74BCC0E40ED} shared Win32Proj - $(VCTargetsPath11) @@ -482,7 +481,6 @@ - diff --git a/win/VC110/shared.vcxproj.filters b/win/VC110/shared.vcxproj.filters index c99bb0cd3..3591706d8 100644 --- a/win/VC110/shared.vcxproj.filters +++ b/win/VC110/shared.vcxproj.filters @@ -45,6 +45,9 @@ Database\DataStores + + Util + Log @@ -81,12 +84,12 @@ Database - - Util - Database\DataStores + + Util + @@ -104,9 +107,6 @@ Database - - Database - Database diff --git a/win/VC110/tbb.vcxproj b/win/VC110/tbb.vcxproj index f5f148769..352319ec6 100644 --- a/win/VC110/tbb.vcxproj +++ b/win/VC110/tbb.vcxproj @@ -54,7 +54,6 @@ {F62787DD-1327-448B-9818-030062BCFAA5} tbb Win32Proj - $(VCTargetsPath11) @@ -152,7 +151,6 @@ MachineX86 - false @@ -293,6 +291,12 @@ /coff /Zi true /coff /Zi + true + true + true + true + true + true true @@ -319,6 +323,12 @@ /coff /Zi true /coff /Zi + true + true + true + true + true + true diff --git a/win/VC110/tbbmalloc.vcxproj b/win/VC110/tbbmalloc.vcxproj index 3c815f955..4bf2a1370 100644 --- a/win/VC110/tbbmalloc.vcxproj +++ b/win/VC110/tbbmalloc.vcxproj @@ -54,7 +54,6 @@ {B15F131E-328A-4D42-ADC2-9FF4CA6306D8} tbbmalloc Win32Proj - $(VCTargetsPath11) @@ -154,7 +153,6 @@ true Windows MachineX86 - false @@ -322,6 +320,12 @@ /coff /Zi true /coff /Zi + true + true + true + true + true + true /coff /Zi @@ -331,6 +335,12 @@ /coff /Zi true /coff /Zi + true + true + true + true + true + true diff --git a/win/VC110/zlib.vcxproj b/win/VC110/zlib.vcxproj index af03584d5..1f6caa44c 100644 --- a/win/VC110/zlib.vcxproj +++ b/win/VC110/zlib.vcxproj @@ -54,7 +54,6 @@ {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} zlib Win32Proj - $(VCTargetsPath11) diff --git a/win/copyfiles.cmd b/win/copyfiles.cmd new file mode 100644 index 000000000..3bf1803e6 --- /dev/null +++ b/win/copyfiles.cmd @@ -0,0 +1,35 @@ +echo ****************************************************** +echo ** COPY STEP ** +echo ****************************************************** +echo . +echo ********************** +echo ** Source Path ** +echo ********************** +echo Source: %1 +echo . +echo ********************** +echo ** Destination Path ** +echo ********************** +echo Destination: %2 +echo . +echo ********************** +echo ** Current Path ** +echo ********************** +cd +echo . +echo ********************** +echo ** DLL's ** +echo ********************** +copy ..\%1\*.dll %2 +echo ********************** +echo ** mangosd.conf ** +echo ********************** +copy ..\..\src\mangosd\mangosd.conf.dist.in %2 +echo ********************** +echo ** ahbot.conf ** +echo ********************** +copy ..\..\src\game\AuctionHouseBot\ahbot.conf.dist.in %2 +rem echo ********************** +rem echo ** mods.conf ** +rem echo ********************** +rem copy ..\..\src\game\extras\mods.conf.dist.in %2