From a7486b115da67f655b5db2db5b0ac890f52acfe0 Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 3 Aug 2009 16:11:22 +0000 Subject: [PATCH] Allow makemovie to build on Win32 using our ffmpeg binaries. git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@3611 92316355-f0b4-4df1-b90c-862c8a59935f --- ThePimp/ThePimp.csproj | 2 +- libpipi.sln | 58 +++++++++++++++++++++++++++++++++-- pipi-sharp/pipi-sharp.csproj | 2 +- pipi-sharp/test-csharp.csproj | 2 +- src/pipi.vcproj | 24 ++++----------- 5 files changed, 65 insertions(+), 23 deletions(-) diff --git a/ThePimp/ThePimp.csproj b/ThePimp/ThePimp.csproj index bd8698d..065d067 100644 --- a/ThePimp/ThePimp.csproj +++ b/ThePimp/ThePimp.csproj @@ -97,7 +97,7 @@ {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0} - pipi-sharp + pipi-sharp %28pipi-sharp\pipi-sharp%29 diff --git a/libpipi.sln b/libpipi.sln index 2c12318..a67feeb 100644 --- a/libpipi.sln +++ b/libpipi.sln @@ -1,10 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 +# Visual Studio 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} {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} = {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} + {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0} = {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pipi-sharp", "pipi-sharp\pipi-sharp.csproj", "{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}" @@ -21,6 +21,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pipi", "src\pipi.vcproj", " {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} = {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{3CFD0755-0BFC-44DA-91C7-A5C0DC3E48AF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipi", "pipi", "{18F9A849-0E5F-4D46-B448-9B252283249C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipi-sharp", "pipi-sharp", "{52E566EC-7535-4456-A862-350C8774C336}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThePimp", "ThePimp", "{40B4C19A-4C88-4D36-81F0-49325837874D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sharpen", "examples\sharpen.vcproj", "{D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}" + ProjectSection(ProjectDependencies) = postProject + {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} = {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makemovie", "examples\makemovie.vcproj", "{A65DC7CE-D5BF-4CB6-942F-C970076E68C9}" + ProjectSection(ProjectDependencies) = postProject + {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} = {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -46,6 +64,7 @@ Global {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|Win32.Build.0 = 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 @@ -60,6 +79,7 @@ Global {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|Win32.Build.0 = 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 @@ -74,6 +94,7 @@ Global {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|Win32.Build.0 = 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 @@ -103,8 +124,41 @@ Global {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 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Win32.ActiveCfg = Debug|Win32 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Win32.Build.0 = Debug|Win32 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Win64.ActiveCfg = Debug|Win32 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Any CPU.ActiveCfg = Release|Win32 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Mixed Platforms.Build.0 = Release|Win32 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Win32.ActiveCfg = Release|Win32 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Win32.Build.0 = Release|Win32 + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Win64.ActiveCfg = Release|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Win32.Build.0 = Debug|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Win64.ActiveCfg = Debug|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Any CPU.ActiveCfg = Release|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Mixed Platforms.Build.0 = Release|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Win32.ActiveCfg = Release|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Win32.Build.0 = Release|Win32 + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Win64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0} = {52E566EC-7535-4456-A862-350C8774C336} + {2A062F77-ED16-4B74-B7B7-5ED93FAF300A} = {52E566EC-7535-4456-A862-350C8774C336} + {D681A55E-B8E2-4741-87E6-49500109D6E0} = {40B4C19A-4C88-4D36-81F0-49325837874D} + {26DD9429-2360-4F4F-80B5-251F3BD75D74} = {18F9A849-0E5F-4D46-B448-9B252283249C} + {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} = {18F9A849-0E5F-4D46-B448-9B252283249C} + {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0} = {3CFD0755-0BFC-44DA-91C7-A5C0DC3E48AF} + {A65DC7CE-D5BF-4CB6-942F-C970076E68C9} = {3CFD0755-0BFC-44DA-91C7-A5C0DC3E48AF} + EndGlobalSection EndGlobal diff --git a/pipi-sharp/pipi-sharp.csproj b/pipi-sharp/pipi-sharp.csproj index e0ad8b9..6307a8a 100644 --- a/pipi-sharp/pipi-sharp.csproj +++ b/pipi-sharp/pipi-sharp.csproj @@ -41,7 +41,7 @@ pipi-sharp true pipi_sharp - false + true true x86 diff --git a/pipi-sharp/test-csharp.csproj b/pipi-sharp/test-csharp.csproj index 49ceb71..aa44320 100644 --- a/pipi-sharp/test-csharp.csproj +++ b/pipi-sharp/test-csharp.csproj @@ -54,7 +54,7 @@ {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0} - pipi-sharp + pipi-sharp %28pipi-sharp\pipi-sharp%29 diff --git a/src/pipi.vcproj b/src/pipi.vcproj index ee6df39..4ad7400 100644 --- a/src/pipi.vcproj +++ b/src/pipi.vcproj @@ -172,26 +172,14 @@ - - - - - + - - - +