aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/framework/Platform/Define.h11
-rw-r--r--win/VC80/ScriptsInterfaces.vcproj8
-rw-r--r--win/VC80/TrinityCore.vcproj4
-rw-r--r--win/VC80/TrinityRealm.vcproj4
-rw-r--r--win/VC80/framework.vcproj4
-rw-r--r--win/VC80/g3dlite.vcproj26
-rw-r--r--win/VC80/game.vcproj4
-rw-r--r--win/VC80/genrevision.vcproj4
-rw-r--r--win/VC80/shared.vcproj4
-rw-r--r--win/VC80/sockets.vcproj40
-rw-r--r--win/VC90/ScriptsInterfaces.vcproj4
-rw-r--r--win/VC90/TrinityCore.vcproj4
-rw-r--r--win/VC90/TrinityRealm.vcproj5
-rw-r--r--win/VC90/framework.vcproj5
-rw-r--r--win/VC90/g3dlite.vcproj5
-rw-r--r--win/VC90/game.vcproj86
-rw-r--r--win/VC90/genrevision.vcproj5
-rw-r--r--win/VC90/shared.vcproj58
-rw-r--r--win/VC90/sockets.vcproj5
19 files changed, 149 insertions, 137 deletions
diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
index 8f10fc20020..35bc07f5656 100644
--- a/src/framework/Platform/Define.h
+++ b/src/framework/Platform/Define.h
@@ -145,8 +145,17 @@ typedef uint64 OBJECT_HANDLE;
#define MaNGOS Trinity
#define MANGOS_DLL_DECL TRINITY_DLL_DECL
#define MANGOS_DLL_SPEC TRINITY_DLL_SPEC
-#define MANGOS_DEBUG TRINITY_DEBUG
#define GetMangosString GetTrinityString
+#if defined(MANGOS_DEBUG) || defined(TRINITY_DEBUG)
+# ifndef TRINITY_DEBUG
+# define TRINITY_DEBUG
+# endif
+# ifndef MANGOS_DEBUG
+# define MANGOS_DEBUG
+# endif
+#endif
+
+
#endif //TRINITY_DEFINE_H
diff --git a/win/VC80/ScriptsInterfaces.vcproj b/win/VC80/ScriptsInterfaces.vcproj
index d4329a747cc..396734c65d3 100644
--- a/win/VC80/ScriptsInterfaces.vcproj
+++ b/win/VC80/ScriptsInterfaces.vcproj
@@ -375,8 +375,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
+ RuntimeLibrary="2"
EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -458,8 +458,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
+ RuntimeLibrary="2"
EnableEnhancedInstructionSet="0"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/win/VC80/TrinityCore.vcproj b/win/VC80/TrinityCore.vcproj
index 3548c707cc5..f2af23cbcdf 100644
--- a/win/VC80/TrinityCore.vcproj
+++ b/win/VC80/TrinityCore.vcproj
@@ -48,7 +48,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
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"
+ PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -352,7 +352,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
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"
+ PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
diff --git a/win/VC80/TrinityRealm.vcproj b/win/VC80/TrinityRealm.vcproj
index 8be0bdf2829..3d410af4364 100644
--- a/win/VC80/TrinityRealm.vcproj
+++ b/win/VC80/TrinityRealm.vcproj
@@ -48,7 +48,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -148,7 +148,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
diff --git a/win/VC80/framework.vcproj b/win/VC80/framework.vcproj
index dd46cd112dd..e62293c863b 100644
--- a/win/VC80/framework.vcproj
+++ b/win/VC80/framework.vcproj
@@ -345,7 +345,7 @@
AdditionalOptions="/Zl /MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true"
MinimalRebuild="false"
RuntimeLibrary="2"
@@ -421,7 +421,7 @@
AdditionalOptions="/Zl /MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true"
MinimalRebuild="false"
RuntimeLibrary="2"
diff --git a/win/VC80/g3dlite.vcproj b/win/VC80/g3dlite.vcproj
index 56176101a64..5b76b6fb9c1 100644
--- a/win/VC80/g3dlite.vcproj
+++ b/win/VC80/g3dlite.vcproj
@@ -181,18 +181,14 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include\g3dlite"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
+ RuntimeLibrary="2"
+ EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
@@ -232,7 +228,7 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
@@ -253,15 +249,18 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include\g3dlite"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- EnableEnhancedInstructionSet="1"
- FloatingPointModel="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
UsePrecompiledHeader="0"
AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
@@ -400,10 +399,9 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\dep\include\g3dlite"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="0"
- FloatingPointModel="2"
UsePrecompiledHeader="0"
AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj
index d210b1e0056..d1706ffb052 100644
--- a/win/VC80/game.vcproj
+++ b/win/VC80/game.vcproj
@@ -130,7 +130,7 @@
AdditionalOptions="/MP /Zm200"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -377,7 +377,7 @@
AdditionalOptions="/MP /bigobj /Zm200"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
diff --git a/win/VC80/genrevision.vcproj b/win/VC80/genrevision.vcproj
index a9ea44b72bd..2faca2dd650 100644
--- a/win/VC80/genrevision.vcproj
+++ b/win/VC80/genrevision.vcproj
@@ -187,7 +187,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@@ -406,7 +406,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
diff --git a/win/VC80/shared.vcproj b/win/VC80/shared.vcproj
index 50bf3b6e00f..b44c59444a4 100644
--- a/win/VC80/shared.vcproj
+++ b/win/VC80/shared.vcproj
@@ -47,7 +47,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -130,7 +130,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
diff --git a/win/VC80/sockets.vcproj b/win/VC80/sockets.vcproj
index 4463b730bdc..9d057f5dd55 100644
--- a/win/VC80/sockets.vcproj
+++ b/win/VC80/sockets.vcproj
@@ -46,7 +46,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include\sockets"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -96,7 +96,7 @@
/>
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="Debug|Win32"
OutputDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
@@ -119,21 +119,18 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include\sockets"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- EnableEnhancedInstructionSet="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)/sockets.pch"
+ PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\sockets.pch"
AssemblerListingLocation=".\sockets__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\sockets__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\sockets__$(PlatformName)_$(ConfigurationName)\"
@@ -148,7 +145,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -205,7 +202,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include\sockets"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
@@ -276,18 +273,21 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="0"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include\sockets"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\sockets.pch"
+ PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)/sockets.pch"
AssemblerListingLocation=".\sockets__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\sockets__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\sockets__$(PlatformName)_$(ConfigurationName)\"
@@ -302,7 +302,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -360,7 +360,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include\sockets"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
@@ -438,7 +438,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include\sockets"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
diff --git a/win/VC90/ScriptsInterfaces.vcproj b/win/VC90/ScriptsInterfaces.vcproj
index 7037cffdf68..26d4bf4a14e 100644
--- a/win/VC90/ScriptsInterfaces.vcproj
+++ b/win/VC90/ScriptsInterfaces.vcproj
@@ -210,7 +210,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
@@ -292,7 +292,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="0"
UsePrecompiledHeader="0"
diff --git a/win/VC90/TrinityCore.vcproj b/win/VC90/TrinityCore.vcproj
index c93fa3eda09..dcce15861a2 100644
--- a/win/VC90/TrinityCore.vcproj
+++ b/win/VC90/TrinityCore.vcproj
@@ -49,7 +49,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
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"
+ PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;;WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -150,7 +150,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
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"
+ PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;;WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj
index 98f1979ab1d..f2d56d22f8c 100644
--- a/win/VC90/TrinityRealm.vcproj
+++ b/win/VC90/TrinityRealm.vcproj
@@ -6,6 +6,7 @@
ProjectGUID="{563E9905-3657-460C-AE63-0AC39D162E23}"
RootNamespace="TrinityRealm"
Keyword="Win32Proj"
+ TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;,WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;,WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -147,7 +148,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;,WIN32,NDEBUG,_CONSOLE"
+ PreprocessorDefinitions="VERSION=&quot;0.12.0-SVN&quot;,WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
diff --git a/win/VC90/framework.vcproj b/win/VC90/framework.vcproj
index 8639ac00d9b..a43051c83b3 100644
--- a/win/VC90/framework.vcproj
+++ b/win/VC90/framework.vcproj
@@ -6,6 +6,7 @@
ProjectGUID="{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}"
RootNamespace="framework"
Keyword="Win32Proj"
+ TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -197,7 +198,7 @@
AdditionalOptions="/Zl /MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true"
MinimalRebuild="false"
RuntimeLibrary="2"
@@ -273,7 +274,7 @@
AdditionalOptions="/Zl /MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true"
MinimalRebuild="false"
RuntimeLibrary="2"
diff --git a/win/VC90/g3dlite.vcproj b/win/VC90/g3dlite.vcproj
index 94b74589c74..3420bfc0799 100644
--- a/win/VC90/g3dlite.vcproj
+++ b/win/VC90/g3dlite.vcproj
@@ -6,6 +6,7 @@
ProjectGUID="{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
RootNamespace="sockets"
Keyword="Win32Proj"
+ TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -189,7 +190,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\dep\include\g3dlite"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
@@ -258,7 +259,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\dep\include\g3dlite"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="0"
UsePrecompiledHeader="0"
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index f67bb2f5155..d7e87dadbe3 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -48,7 +48,7 @@
AdditionalOptions="/MP /Zm200"
Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -102,7 +102,7 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
@@ -124,17 +124,19 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/MP /Zm200"
- InlineFunctionExpansion="1"
+ AdditionalOptions="/MP /bigobj /Zm200"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD"
- StringPooling="true"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
+ StringPooling="false"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
- EnableEnhancedInstructionSet="1"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="pchdef.h"
@@ -155,7 +157,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -163,6 +165,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ AdditionalDependencies=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib"
SuppressStartupBanner="true"
/>
@@ -183,7 +186,7 @@
/>
</Configuration>
<Configuration
- Name="Debug_NoPCH|Win32"
+ Name="Release|Win32"
OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
@@ -208,17 +211,17 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
- Optimization="0"
+ AdditionalOptions="/MP /Zm200"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;"
- StringPooling="false"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
+ StringPooling="true"
+ RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="1"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="0"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="pchdef.h"
PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
@@ -229,13 +232,14 @@
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
+ ForcedIncludeFiles="pchdef.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -263,7 +267,7 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|x64"
OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
@@ -290,14 +294,13 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP /bigobj /Zm200"
- Optimization="0"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;"
- StringPooling="false"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
+ StringPooling="true"
+ RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="pchdef.h"
@@ -318,7 +321,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -347,7 +350,7 @@
/>
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="Debug_NoPCH|Win32"
OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
@@ -369,21 +372,20 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/MP /bigobj /Zm200"
- InlineFunctionExpansion="1"
+ AdditionalOptions="/MP"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD"
- StringPooling="true"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
+ StringPooling="false"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
- EnableEnhancedInstructionSet="0"
RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="pchdef.h"
+ UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
@@ -394,14 +396,13 @@
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
- ForcedIncludeFiles="pchdef.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -409,7 +410,6 @@
/>
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib"
SuppressStartupBanner="true"
/>
@@ -459,7 +459,7 @@
AdditionalOptions="/MP /bigobj"
Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -1708,7 +1708,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1717,7 +1717,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/win/VC90/genrevision.vcproj b/win/VC90/genrevision.vcproj
index 0cb0138bb91..435bb7b44b4 100644
--- a/win/VC90/genrevision.vcproj
+++ b/win/VC90/genrevision.vcproj
@@ -6,6 +6,7 @@
ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
RootNamespace="genrevision"
Keyword="Win32Proj"
+ TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -190,7 +191,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@@ -266,7 +267,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
index aa0d061648f..adab5798d28 100644
--- a/win/VC90/shared.vcproj
+++ b/win/VC90/shared.vcproj
@@ -49,7 +49,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -101,7 +101,7 @@
/>
</Configuration>
<Configuration
- Name="Debug|Win32"
+ Name="Release|x64"
OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
@@ -124,19 +124,21 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="0"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ StringPooling="true"
+ RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
+ PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch"
AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
@@ -152,7 +154,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -160,6 +162,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
SuppressStartupBanner="true"
@@ -181,7 +184,7 @@
/>
</Configuration>
<Configuration
- Name="Debug_NoPCH|Win32"
+ Name="Debug|Win32"
OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
@@ -210,7 +213,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
@@ -241,7 +244,7 @@
<Tool
Name="VCLibrarianTool"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
- AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug"
+ AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
SuppressStartupBanner="true"
/>
<Tool
@@ -261,7 +264,7 @@
/>
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="Debug|x64"
OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
@@ -289,16 +292,15 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
- StringPooling="true"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
- EnableEnhancedInstructionSet="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch"
+ PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
@@ -314,7 +316,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -344,7 +346,7 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Debug_NoPCH|Win32"
OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
@@ -367,14 +369,13 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
@@ -404,9 +405,8 @@
/>
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
- AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
+ AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug"
SuppressStartupBanner="true"
/>
<Tool
@@ -456,7 +456,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
@@ -878,7 +878,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
@@ -889,7 +889,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_NoPCH|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
@@ -900,7 +900,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
@@ -911,7 +911,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Debug_NoPCH|Win32"
>
<Tool
Name="VCCustomBuildTool"
diff --git a/win/VC90/sockets.vcproj b/win/VC90/sockets.vcproj
index 9c3c0e80185..7576e7cc7a9 100644
--- a/win/VC90/sockets.vcproj
+++ b/win/VC90/sockets.vcproj
@@ -6,6 +6,7 @@
ProjectGUID="{04BAF755-0D67-46F8-B1C6-77AE5368F3CB}"
RootNamespace="sockets"
Keyword="Win32Proj"
+ TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -47,7 +48,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include\sockets"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -126,7 +127,7 @@
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include\sockets"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"