WinGui: Build fixes.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4112 b64f7644-9d1e-0410-96f1-a4d463321fa5

4 files changed, 68 insertions, 11 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 58e2b10fe..971131b74 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -41,9 +41,33 @@
     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

-    <PlatformTarget>AnyCPU</PlatformTarget>

+    <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">

+    <PlatformTarget>x86</PlatformTarget>

+    <OutputPath>bin\x86\Debug\</OutputPath>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">

+    <PlatformTarget>x86</PlatformTarget>

+    <OutputPath>bin\x86\Release\</OutputPath>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|x86'">

+    <PlatformTarget>x86</PlatformTarget>

+    <OutputPath>bin\x86\NightlyBuild\</OutputPath>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">

+    <PlatformTarget>x64</PlatformTarget>

+    <OutputPath>bin\x64\Debug\</OutputPath>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">

+    <PlatformTarget>x64</PlatformTarget>

+    <OutputPath>bin\x64\Release\</OutputPath>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|x64'">

+    <PlatformTarget>x64</PlatformTarget>

+    <OutputPath>bin\x64\NightlyBuild\</OutputPath>

+  </PropertyGroup>

   <ItemGroup>

     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
index 5f0815e85..d2ffa38d0 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
@@ -100,6 +100,19 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>

     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>

   </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'NightlyBuild|AnyCPU' ">

+    <OutputPath>bin\NightlyBuild\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <Optimize>true</Optimize>

+    <DebugType>pdbonly</DebugType>

+    <PlatformTarget>x86</PlatformTarget>

+    <ErrorReport>prompt</ErrorReport>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|x86'">

+    <PlatformTarget>x86</PlatformTarget>

+    <Optimize>true</Optimize>

+    <DefineConstants>TRACE</DefineConstants>

+  </PropertyGroup>

   <ItemGroup>

     <Reference Include="PresentationCore">

       <RequiredTargetFramework>3.0</RequiredTargetFramework>

diff --git a/win/CS/HandBrake10.sln b/win/CS/HandBrake10.sln
index d850cd4da..cc71d5d5c 100644
--- a/win/CS/HandBrake10.sln
+++ b/win/CS/HandBrake10.sln
@@ -59,26 +59,26 @@ Global
 		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.Build.0 = Release|x86

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Mixed Platforms.ActiveCfg = Debug|x86

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Mixed Platforms.Build.0 = Debug|x86

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x64.ActiveCfg = Debug|Any CPU

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.ActiveCfg = Debug|Any CPU

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|Any CPU.ActiveCfg = Release|Any CPU

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|Any CPU.Build.0 = Release|Any CPU

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|Mixed Platforms.ActiveCfg = NightlyBuild|Any CPU

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|Mixed Platforms.Build.0 = NightlyBuild|Any CPU

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|Mixed Platforms.ActiveCfg = NightlyBuild|x86

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|Mixed Platforms.Build.0 = NightlyBuild|x86

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|x64.ActiveCfg = NightlyBuild|Any CPU

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Install|x86.ActiveCfg = Release|Any CPU

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|Any CPU.ActiveCfg = NightlyBuild|Any CPU

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|Any CPU.Build.0 = NightlyBuild|Any CPU

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|Mixed Platforms.ActiveCfg = NightlyBuild|Any CPU

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|Mixed Platforms.Build.0 = NightlyBuild|Any CPU

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|Mixed Platforms.ActiveCfg = NightlyBuild|x86

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|Mixed Platforms.Build.0 = NightlyBuild|x86

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|x64.ActiveCfg = NightlyBuild|Any CPU

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.NightlyBuild|x86.ActiveCfg = Release|Any CPU

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Any CPU.Build.0 = Release|Any CPU

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Mixed Platforms.Build.0 = Release|Any CPU

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Mixed Platforms.ActiveCfg = Release|x86

+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Mixed Platforms.Build.0 = Release|x86

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|x64.ActiveCfg = Release|Any CPU

 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|x86.ActiveCfg = Release|Any CPU

 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|Any CPU.ActiveCfg = Debug|x86

@@ -119,8 +119,8 @@ Global
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Install|x86.ActiveCfg = Release|x86

 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Install|x86.Build.0 = Release|x86

 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|Any CPU.ActiveCfg = Release|x86

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|Mixed Platforms.ActiveCfg = Release|x86

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|Mixed Platforms.Build.0 = Release|x86

+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|Mixed Platforms.ActiveCfg = NightlyBuild|x86

+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|Mixed Platforms.Build.0 = NightlyBuild|x86

 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|x64.ActiveCfg = Release|x86

 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|x86.ActiveCfg = Release|x86

 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.NightlyBuild|x86.Build.0 = Release|x86

diff --git a/win/CS/HandBrakeCS.csproj b/win/CS/HandBrakeCS.csproj
index 34536d7d6..a6aa061bc 100644
--- a/win/CS/HandBrakeCS.csproj
+++ b/win/CS/HandBrakeCS.csproj
@@ -144,6 +144,26 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>

     <Optimize>true</Optimize>

   </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">

+    <PlatformTarget>x64</PlatformTarget>

+    <OutputPath>bin\x64\Debug\</OutputPath>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">

+    <PlatformTarget>x64</PlatformTarget>

+    <OutputPath>bin\x64\Release\</OutputPath>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Build|x64'">

+    <PlatformTarget>x64</PlatformTarget>

+    <OutputPath>bin\x64\Build\</OutputPath>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Install|x64'">

+    <PlatformTarget>x64</PlatformTarget>

+    <OutputPath>bin\x64\Install\</OutputPath>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|x64'">

+    <PlatformTarget>x64</PlatformTarget>

+    <OutputPath>bin\x64\NightlyBuild\</OutputPath>

+  </PropertyGroup>

   <ItemGroup>

     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">

       <SpecificVersion>False</SpecificVersion>