Removed Ogre GL plugin from default config.

Added generate-and-run builder to DSL. Added /MP directive to all project files to speed up compilation.
MelvinRook · Jan 26, 2012 · 68063fa · 68063fa
1 parent 0ea80e0
commit 68063fa
Show file tree

Hide file tree

Showing 13 changed files with 298 additions and 114 deletions.
diff --git a/Build/VC10/Diversia.sln b/Build/VC10/Diversia.sln
@@ -151,4 +151,7 @@ Global
 		{7CED3404-A267-4441-9E78-EC55C063C997} = {4C2DFE9D-41D8-484F-892A-2DF4CACA9812}
 		{9A163E30-0F4B-4CEC-8854-6A32CA4AF961} = {A6BF076B-D443-4BA1-A5E6-D9E9C8F94E3C}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		QtVersion = qt
+	EndGlobalSection
 EndGlobal
diff --git a/Build/VC10/LibClient.vcxproj b/Build/VC10/LibClient.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Client\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_CLIENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -84,7 +84,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Client\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_CLIENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -97,7 +97,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDebug|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Client\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_CLIENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/Build/VC10/LibObject.vcxproj b/Build/VC10/LibObject.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Object\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_OBJECT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -83,7 +83,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Object\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_OBJECT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -95,7 +95,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDebug|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Object\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_OBJECT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/Build/VC10/LibOgreClient.vcxproj b/Build/VC10/LibOgreClient.vcxproj
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>OgreClient\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_OGRECLIENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -84,7 +84,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>OgreClient\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_OGRECLIENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -97,7 +97,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDebug|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>OgreClient\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_OGRECLIENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/Build/VC10/LibShared.vcxproj b/Build/VC10/LibShared.vcxproj
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Shared\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_SHARED_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -83,7 +83,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Shared\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_SHARED_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -95,7 +95,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDebug|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Shared\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_SHARED_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/Build/VC10/LibUtil.vcxproj b/Build/VC10/LibUtil.vcxproj
@@ -70,23 +70,23 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Util\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_UTIL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Util\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_UTIL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDebug|Win32'">
     <ClCompile>
-      <AdditionalOptions>-Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm300 /MP %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeaderFile>Util\Platform\StableHeaders.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>DIVERSIA_UTIL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>

diff --git a/Build/VC10/OgreClient.vcxproj b/Build/VC10/OgreClient.vcxproj
@@ -108,6 +108,9 @@
     </Link>
     <ProjectReference />
     <ProjectReference />
+    <ProjectReference>
+      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
+    </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="LibClient.vcxproj">

diff --git a/Build/VC10/Qt4VSPropertySheet.props b/Build/VC10/Qt4VSPropertySheet.props