aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-14 21:26:14 -0500
committermegamage <none@none>2009-08-14 21:26:14 -0500
commit026659565df31dc41834d417feb84b20320215e3 (patch)
tree1cf1734e48b0561c87e8bb144641ddec115aaf8a
parentde8eb15699d903273f7631909a95e08f61fb62ec (diff)
*Some cleanup of script vcproj (according to SD2)
--HG-- branch : trunk
-rw-r--r--src/bindings/scripts/VC80/80ScriptDev2.vcproj300
-rw-r--r--src/bindings/scripts/VC90/90ScriptDev2.vcproj50
2 files changed, 174 insertions, 176 deletions
diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index 10b26d42e4c..e4a32705566 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -54,8 +54,8 @@
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="precompiled.h"
WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -75,8 +75,6 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/TrinityScript.pdb"
SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/TrinityScript.lib"
TargetMachine="1"
/>
@@ -99,11 +97,14 @@
Name="VCAppVerifierTool"
/>
<Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="..\..\..\..\bin\$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\ScriptDev2__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
@@ -125,15 +126,16 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
- RuntimeLibrary="2"
- EnableEnhancedInstructionSet="1"
- FloatingPointModel="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="precompiled.h"
WarningLevel="3"
@@ -151,18 +153,15 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="TrinityCore.lib ace.lib"
+ AdditionalDependencies="TrinityCore.lib aced.lib"
OutputFile="$(OutDir)/TrinityScript.dll"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\win\VC80\trinitycore__$(PlatformName)_$(ConfigurationName);..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
- GenerateDebugInformation="false"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/TrinityScript.pdb"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/TrinityScript.lib"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -183,11 +182,14 @@
Name="VCAppVerifierTool"
/>
<Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|Win32"
OutputDirectory="..\..\..\..\bin\$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\ScriptDev2__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
@@ -209,16 +211,13 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
+ RuntimeLibrary="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="precompiled.h"
WarningLevel="3"
@@ -236,15 +235,17 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="TrinityCore.lib aced.lib"
+ AdditionalDependencies="TrinityCore.lib ace.lib"
OutputFile="$(OutDir)/TrinityScript.dll"
- LinkIncremental="2"
+ LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\win\VC80\trinitycore__$(PlatformName)_$(ConfigurationName);..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/TrinityScript.pdb"
+ GenerateDebugInformation="false"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+
ImportLibrary="$(OutDir)/TrinityScript.lib"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -302,7 +303,6 @@
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
RuntimeLibrary="2"
- FloatingPointModel="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="precompiled.h"
WarningLevel="3"
@@ -360,9 +360,9 @@
<References>
</References>
<Files>
- <Filter
- Name="scripts"
- >
+ <Filter
+ Name="scripts"
+ >
<Filter
Name="areatrigger"
>
@@ -371,42 +371,42 @@
>
</File>
</Filter>
- <Filter
- Name="boss"
- >
- <File
- RelativePath="..\scripts\boss\boss_emeriss.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\boss\boss_lethon.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\boss\boss_taerar.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\boss\boss_ysondre.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="creature"
- >
- <File
- RelativePath="..\scripts\creature\mob_generic_creature.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\creature\simple_ai.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\creature\simple_ai.h"
- >
- </File>
- </Filter>
+ <Filter
+ Name="boss"
+ >
+ <File
+ RelativePath="..\scripts\boss\boss_emeriss.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\boss\boss_lethon.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\boss\boss_taerar.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\boss\boss_ysondre.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="creature"
+ >
+ <File
+ RelativePath="..\scripts\creature\mob_generic_creature.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\creature\simple_ai.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\creature\simple_ai.h"
+ >
+ </File>
+ </Filter>
<Filter
Name="eastern_kingdoms"
>
@@ -499,26 +499,26 @@
>
</File>
</Filter>
- <Filter
- Name="examples"
- >
- <File
- RelativePath="..\scripts\examples\example_creature.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\examples\example_escort.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\examples\example_gossip_codebox.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\examples\example_misc.cpp"
- >
- </File>
- </Filter>
+ <Filter
+ Name="examples"
+ >
+ <File
+ RelativePath="..\scripts\examples\example_creature.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\examples\example_escort.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\examples\example_gossip_codebox.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\examples\example_misc.cpp"
+ >
+ </File>
+ </Filter>
<Filter
Name="go"
>
@@ -527,22 +527,22 @@
>
</File>
</Filter>
- <Filter
- Name="guard"
- >
- <File
- RelativePath="..\scripts\guard\guard_ai.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\guard\guard_ai.h"
- >
- </File>
- <File
- RelativePath="..\scripts\guard\guards.cpp"
- >
- </File>
- </Filter>
+ <Filter
+ Name="guard"
+ >
+ <File
+ RelativePath="..\scripts\guard\guard_ai.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\guard\guard_ai.h"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\guard\guards.cpp"
+ >
+ </File>
+ </Filter>
<Filter
Name="item"
>
@@ -666,34 +666,34 @@
>
</File>
</Filter>
- <Filter
- Name="npc"
- >
- <File
- RelativePath="..\scripts\npc\npc_escortAI.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\npc\npc_escortAI.h"
- >
- </File>
- <File
- RelativePath="..\scripts\npc\npc_innkeeper.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\npc\npc_professions.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\npc\npc_taxi.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\npc\npcs_special.cpp"
- >
- </File>
- </Filter>
+ <Filter
+ Name="npc"
+ >
+ <File
+ RelativePath="..\scripts\npc\npc_escortAI.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\npc\npc_escortAI.h"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\npc\npc_innkeeper.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\npc\npc_professions.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\npc\npc_taxi.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\npc\npcs_special.cpp"
+ >
+ </File>
+ </Filter>
<Filter
Name="outland"
>
@@ -2779,22 +2779,22 @@
Name="honor"
>
</Filter>
- <Filter
- Name="servers"
- >
- </Filter>
- <Filter
- Name="custom"
- >
- <File
- RelativePath="..\scripts\custom\npc_acherus_taxi.cpp"
- >
- </File>
- <File
- RelativePath="..\scripts\custom\npc_wyrmresttempel_taxi.cpp"
- >
- </File>
- </Filter>
+ <Filter
+ Name="servers"
+ >
+ </Filter>
+ <Filter
+ Name="custom"
+ >
+ <File
+ RelativePath="..\scripts\custom\npc_acherus_taxi.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripts\custom\npc_wyrmresttempel_taxi.cpp"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="Include"
diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
index 1c503f7829c..8aa552725ed 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -55,7 +55,7 @@
PrecompiledHeaderThrough="precompiled.h"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -103,7 +103,7 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="..\..\..\..\bin\$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\ScriptDev2__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
@@ -125,16 +125,16 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
- MinimalRebuild="false"
- RuntimeLibrary="2"
- EnableEnhancedInstructionSet="1"
- FloatingPointModel="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="precompiled.h"
WarningLevel="3"
@@ -152,18 +152,17 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="trinitycore.lib ace.lib"
+ AdditionalDependencies="trinitycore.lib aced.lib"
OutputFile="$(OutDir)/TrinityScript.dll"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\win\VC90\trinitycore__$(PlatformName)_$(ConfigurationName);..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
- GenerateDebugInformation="false"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/TrinityScript.pdb"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/TrinityScript.lib"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -188,7 +187,7 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|Win32"
OutputDirectory="..\..\..\..\bin\$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\ScriptDev2__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
@@ -210,16 +209,14 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
- PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
+ MinimalRebuild="false"
+ RuntimeLibrary="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="precompiled.h"
WarningLevel="3"
@@ -237,17 +234,18 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="trinitycore.lib aced.lib"
+ AdditionalDependencies="trinitycore.lib ace.lib"
OutputFile="$(OutDir)/TrinityScript.dll"
- LinkIncremental="2"
+ LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\win\VC90\trinitycore__$(PlatformName)_$(ConfigurationName);..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/TrinityScript.pdb"
+ GenerateDebugInformation="false"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/TrinityScript.lib"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"