summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2011-07-16 17:44:44 +0000
committersr55 <[email protected]>2011-07-16 17:44:44 +0000
commitb7bd335a32a15c792cf0539bc1c96f46209452f3 (patch)
tree699dfc29f3d9c865ab9a4e05c015dd8e5b2352a3
parent2369ef20d1ecbc29dd86ddca62dae2f9af0b4d6a (diff)
WinGui: Another build fix.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4116 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/CS/HandBrake10.sln5
-rw-r--r--win/CS/HandBrakeCS.csproj8
-rw-r--r--win/CS/build.xml6
3 files changed, 15 insertions, 4 deletions
diff --git a/win/CS/HandBrake10.sln b/win/CS/HandBrake10.sln
index df6c8fd04..03bc9fdc2 100644
--- a/win/CS/HandBrake10.sln
+++ b/win/CS/HandBrake10.sln
@@ -9,6 +9,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeWPF", "HandBrakeWP
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeInterop", "HandBrake.Interop\HandBrakeInterop\HandBrakeInterop.csproj", "{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5CB7BC74-449C-4E95-98AB-E1E4387E514B}"
+ ProjectSection(SolutionItems) = preProject
+ build.xml = build.xml
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/win/CS/HandBrakeCS.csproj b/win/CS/HandBrakeCS.csproj
index 1abbc169a..b697eb1b2 100644
--- a/win/CS/HandBrakeCS.csproj
+++ b/win/CS/HandBrakeCS.csproj
@@ -458,10 +458,10 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'NightlyBuild' ">
<PostBuildEvent>
- copy "$(ProjectDir)Installer\MakeNightly.nsi" "$(ProjectDir)bin\NightlyBuild" /Y
- copy "$(ProjectDir)handbrakepineapple.ico" "$(ProjectDir)bin\NightlyBuild" /Y
- xcopy "$(ProjectDir)doc" "$(ProjectDir)bin\NightlyBuild\doc" /I /Y
- makensis "$(ProjectDir)bin\NightlyBuild\MakeNightly.nsi"
+ copy "$(ProjectDir)Installer\MakeNightly.nsi" "$(ProjectDir)bin\x86\NightlyBuild" /Y
+ copy "$(ProjectDir)handbrakepineapple.ico" "$(ProjectDir)bin\x86\NightlyBuild" /Y
+ xcopy "$(ProjectDir)doc" "$(ProjectDir)bin\x86\NightlyBuild\doc" /I /Y
+ makensis "$(ProjectDir)bin\x86\NightlyBuild\MakeNightly.nsi"
</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
diff --git a/win/CS/build.xml b/win/CS/build.xml
new file mode 100644
index 000000000..55d3852b4
--- /dev/null
+++ b/win/CS/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
+
+ <!-- TODO -->
+</Project>