Update the Win32 solution for Visual Studio 2008.

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@3562 92316355-f0b4-4df1-b90c-862c8a59935f

ThePimp/ThePimp.csproj

@@ -1,15 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D681A55E-B8E2-4741-87E6-49500109D6E0}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ThePimp</RootNamespace>
     <AssemblyName>Pimp</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +29,7 @@
     <RootNamespace>ThePimp</RootNamespace>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -36,6 +43,7 @@
     <RootNamespace>ThePimp</RootNamespace>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="atk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
@@ -54,10 +62,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\win32\gtksharp\bin\gtk-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="gtkglarea-sharp, Version=0.0.3.0, Culture=neutral, PublicKeyToken=7df758c0fb49fe62">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\gtksharp\bin\gtkglarea-sharp.dll</HintPath>
-    </Reference>
     <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\win32\gtksharp\bin\Mono.Posix.dll</HintPath>
@@ -105,12 +109,12 @@
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets. -->
   <Target Name="BeforeBuild">
-    <CreateItem Include="..\win32\gtksharp\**\*.*" Exclude="..\win32\**\.svn\**">
-      <Output TaskParameter="Include" ItemName="DistInclude" />
-    </CreateItem>
-    <Copy Sourcefiles="@(DistInclude)" DestinationFolder="$(OutDir)\..\%(RecursiveDir)" />
   </Target>
   <Target Name="AfterBuild">
+    <CreateItem Include="..\win32\gtksharp\**\*.*" Exclude="..\win32\**\.svn\**">
+      <Output TaskParameter="Include" ItemName="ContribDll" />
+    </CreateItem>
+    <Copy SkipUnchangedFiles="True" Sourcefiles="@(ContribDll)" DestinationFolder="$(OutDir)\..\%(RecursiveDir)" />
   </Target>
   <ProjectExtensions>
     <MonoDevelop>
@@ -125,4 +129,4 @@
     </MonoDevelop>
     <VisualStudio />
   </ProjectExtensions>
-</Project>
+</Project>

libpipi.sln

@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-csharp", "pipi-sharp\test-csharp.csproj", "{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0} = {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}
@@ -26,9 +26,11 @@ Global
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|Win32 = Debug|Win32
+		Debug|Win64 = Debug|Win64
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|Win32 = Release|Win32
+		Release|Win64 = Release|Win64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -36,51 +38,71 @@ Global
 		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Debug|Win32.Build.0 = Debug|Any CPU
+		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Debug|Win64.ActiveCfg = Debug|Any CPU
+		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Debug|Win64.Build.0 = Debug|Any CPU
 		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Release|Win32.ActiveCfg = Release|Any CPU
+		{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Release|Win64.ActiveCfg = Release|Any CPU
 		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Debug|Win32.Build.0 = Debug|Any CPU
+		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Debug|Win64.ActiveCfg = Debug|Any CPU
+		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Debug|Win64.Build.0 = Debug|Any CPU
 		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Release|Win32.ActiveCfg = Release|Any CPU
+		{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Release|Win64.ActiveCfg = Release|Any CPU
 		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Debug|Win32.Build.0 = Debug|Any CPU
+		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Debug|Win64.ActiveCfg = Debug|Any CPU
+		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Debug|Win64.Build.0 = Debug|Any CPU
 		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Release|Win32.ActiveCfg = Release|Any CPU
+		{D681A55E-B8E2-4741-87E6-49500109D6E0}.Release|Win64.ActiveCfg = Release|Any CPU
 		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Debug|Win32.Build.0 = Debug|Win32
+		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Debug|Win64.ActiveCfg = Debug|Win32
+		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Debug|Win64.Build.0 = Debug|Win32
 		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Release|Any CPU.ActiveCfg = Release|Win32
 		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
 		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Release|Win32.ActiveCfg = Release|Win32
 		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Release|Win32.Build.0 = Release|Win32
+		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Release|Win64.ActiveCfg = Release|Win32
+		{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Release|Win64.Build.0 = Release|Win32
 		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Debug|Win32.ActiveCfg = Debug|Win32
 		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Debug|Win32.Build.0 = Debug|Win32
+		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Debug|Win64.ActiveCfg = Debug|Win32
+		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Debug|Win64.Build.0 = Debug|Win32
 		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Release|Any CPU.ActiveCfg = Release|Win32
 		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Release|Mixed Platforms.ActiveCfg = Release|Win32
 		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Release|Win32.ActiveCfg = Release|Win32
 		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Release|Win32.Build.0 = Release|Win32
+		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Release|Win64.ActiveCfg = Release|Win32
+		{26DD9429-2360-4F4F-80B5-251F3BD75D74}.Release|Win64.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

pipi-sharp/pipi-sharp.csproj

@@ -1,13 +1,19 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>pipi_sharp</RootNamespace>
     <AssemblyName>pipi-sharp</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,6 +28,7 @@
     <AssemblyName>pipi-sharp</AssemblyName>
     <RootNamespace>pipi_sharp</RootNamespace>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -36,6 +43,7 @@
     <RootNamespace>pipi_sharp</RootNamespace>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -54,4 +62,4 @@
   </Target>
   <Target Name="AfterBuild">
   </Target>
-</Project>
+</Project>

pipi-sharp/test-csharp.csproj

@@ -1,13 +1,19 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>test_csharp</RootNamespace>
     <AssemblyName>test</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,6 +28,7 @@
     <AssemblyName>test</AssemblyName>
     <RootNamespace>test_csharp</RootNamespace>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -36,6 +43,7 @@
     <RootNamespace>test_csharp</RootNamespace>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -57,4 +65,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

pipi/libpipi.vcproj

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="libpipi"
 	ProjectGUID="{48A34C3A-1E36-49B7-92C4-E982FDCB90C0}"
 	RootNamespace="libpipi"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -61,9 +62,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="gdiplus.lib gdi32.lib user32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-0.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -84,9 +88,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -134,11 +135,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="gdiplus.lib gdi32.lib user32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-0.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -159,9 +163,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -200,12 +201,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
@@ -270,6 +265,10 @@
 			<Filter
 				Name="combine"
 				>
+				<File
+					RelativePath=".\combine\blit.c"
+					>
+				</File>
 				<File
 					RelativePath=".\combine\merge.c"
 					>
@@ -342,6 +341,10 @@
 					RelativePath=".\filter\median.c"
 					>
 				</File>
+				<File
+					RelativePath=".\filter\rotate.c"
+					>
+				</File>
 				<File
 					RelativePath=".\filter\transform.c"
 					>

src/pipi.vcproj

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="pipi"
 	ProjectGUID="{26DD9429-2360-4F4F-80B5-251F3BD75D74}"
 	RootNamespace="pipi"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -65,6 +66,8 @@
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -85,9 +88,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -142,6 +142,8 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -162,9 +164,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -193,12 +192,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>