Changeset 3611


Ignore:
Timestamp:
Aug 3, 2009, 6:11:22 PM (11 years ago)
Author:
Sam Hocevar
Message:

Allow makemovie to build on Win32 using our ffmpeg binaries.

Location:
libpipi/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/ThePimp/ThePimp.csproj

    r3562 r3611  
    9898    <ProjectReference Include="..\pipi-sharp\pipi-sharp.csproj">
    9999      <Project>{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}</Project>
    100       <Name>pipi-sharp</Name>
     100      <Name>pipi-sharp %28pipi-sharp\pipi-sharp%29</Name>
    101101    </ProjectReference>
    102102  </ItemGroup>
  • libpipi/trunk/libpipi.sln

    r3562 r3611  
    11
    22Microsoft Visual Studio Solution File, Format Version 10.00
    3 # Visual C++ Express 2008
     3# Visual Studio 2008
    44Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-csharp", "pipi-sharp\test-csharp.csproj", "{2A062F77-ED16-4B74-B7B7-5ED93FAF300A}"
    55        ProjectSection(ProjectDependencies) = postProject
     6                {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} = {48A34C3A-1E36-49B7-92C4-E982FDCB90C0}
    67                {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0} = {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}
    7                 {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} = {48A34C3A-1E36-49B7-92C4-E982FDCB90C0}
    88        EndProjectSection
    99EndProject
     
    1818EndProject
    1919Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pipi", "src\pipi.vcproj", "{26DD9429-2360-4F4F-80B5-251F3BD75D74}"
     20        ProjectSection(ProjectDependencies) = postProject
     21                {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} = {48A34C3A-1E36-49B7-92C4-E982FDCB90C0}
     22        EndProjectSection
     23EndProject
     24Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{3CFD0755-0BFC-44DA-91C7-A5C0DC3E48AF}"
     25EndProject
     26Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipi", "pipi", "{18F9A849-0E5F-4D46-B448-9B252283249C}"
     27EndProject
     28Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipi-sharp", "pipi-sharp", "{52E566EC-7535-4456-A862-350C8774C336}"
     29EndProject
     30Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThePimp", "ThePimp", "{40B4C19A-4C88-4D36-81F0-49325837874D}"
     31EndProject
     32Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sharpen", "examples\sharpen.vcproj", "{D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}"
     33        ProjectSection(ProjectDependencies) = postProject
     34                {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} = {48A34C3A-1E36-49B7-92C4-E982FDCB90C0}
     35        EndProjectSection
     36EndProject
     37Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makemovie", "examples\makemovie.vcproj", "{A65DC7CE-D5BF-4CB6-942F-C970076E68C9}"
    2038        ProjectSection(ProjectDependencies) = postProject
    2139                {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} = {48A34C3A-1E36-49B7-92C4-E982FDCB90C0}
     
    4765                {2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    4866                {2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Release|Win32.ActiveCfg = Release|Any CPU
     67                {2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Release|Win32.Build.0 = Release|Any CPU
    4968                {2A062F77-ED16-4B74-B7B7-5ED93FAF300A}.Release|Win64.ActiveCfg = Release|Any CPU
    5069                {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     
    6180                {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    6281                {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Release|Win32.ActiveCfg = Release|Any CPU
     82                {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Release|Win32.Build.0 = Release|Any CPU
    6383                {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}.Release|Win64.ActiveCfg = Release|Any CPU
    6484                {D681A55E-B8E2-4741-87E6-49500109D6E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     
    7595                {D681A55E-B8E2-4741-87E6-49500109D6E0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    7696                {D681A55E-B8E2-4741-87E6-49500109D6E0}.Release|Win32.ActiveCfg = Release|Any CPU
     97                {D681A55E-B8E2-4741-87E6-49500109D6E0}.Release|Win32.Build.0 = Release|Any CPU
    7798                {D681A55E-B8E2-4741-87E6-49500109D6E0}.Release|Win64.ActiveCfg = Release|Any CPU
    7899                {48A34C3A-1E36-49B7-92C4-E982FDCB90C0}.Debug|Any CPU.ActiveCfg = Debug|Win32
     
    104125                {26DD9429-2360-4F4F-80B5-251F3BD75D74}.Release|Win64.ActiveCfg = Release|Win32
    105126                {26DD9429-2360-4F4F-80B5-251F3BD75D74}.Release|Win64.Build.0 = Release|Win32
     127                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Any CPU.ActiveCfg = Debug|Win32
     128                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
     129                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
     130                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Win32.ActiveCfg = Debug|Win32
     131                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Win32.Build.0 = Debug|Win32
     132                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Debug|Win64.ActiveCfg = Debug|Win32
     133                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Any CPU.ActiveCfg = Release|Win32
     134                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
     135                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Mixed Platforms.Build.0 = Release|Win32
     136                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Win32.ActiveCfg = Release|Win32
     137                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Win32.Build.0 = Release|Win32
     138                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0}.Release|Win64.ActiveCfg = Release|Win32
     139                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Any CPU.ActiveCfg = Debug|Win32
     140                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
     141                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
     142                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Win32.ActiveCfg = Debug|Win32
     143                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Win32.Build.0 = Debug|Win32
     144                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Debug|Win64.ActiveCfg = Debug|Win32
     145                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Any CPU.ActiveCfg = Release|Win32
     146                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
     147                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Mixed Platforms.Build.0 = Release|Win32
     148                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Win32.ActiveCfg = Release|Win32
     149                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Win32.Build.0 = Release|Win32
     150                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9}.Release|Win64.ActiveCfg = Release|Win32
    106151        EndGlobalSection
    107152        GlobalSection(SolutionProperties) = preSolution
    108153                HideSolutionNode = FALSE
    109154        EndGlobalSection
     155        GlobalSection(NestedProjects) = preSolution
     156                {FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0} = {52E566EC-7535-4456-A862-350C8774C336}
     157                {2A062F77-ED16-4B74-B7B7-5ED93FAF300A} = {52E566EC-7535-4456-A862-350C8774C336}
     158                {D681A55E-B8E2-4741-87E6-49500109D6E0} = {40B4C19A-4C88-4D36-81F0-49325837874D}
     159                {26DD9429-2360-4F4F-80B5-251F3BD75D74} = {18F9A849-0E5F-4D46-B448-9B252283249C}
     160                {48A34C3A-1E36-49B7-92C4-E982FDCB90C0} = {18F9A849-0E5F-4D46-B448-9B252283249C}
     161                {D405CD0E-F47F-4C6E-9CB5-2B0F00E7C6D0} = {3CFD0755-0BFC-44DA-91C7-A5C0DC3E48AF}
     162                {A65DC7CE-D5BF-4CB6-942F-C970076E68C9} = {3CFD0755-0BFC-44DA-91C7-A5C0DC3E48AF}
     163        EndGlobalSection
    110164EndGlobal
  • libpipi/trunk/pipi-sharp/pipi-sharp.csproj

    r3562 r3611  
    4242    <DebugSymbols>true</DebugSymbols>
    4343    <RootNamespace>pipi_sharp</RootNamespace>
    44     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     44    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    4545    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
    4646    <PlatformTarget>x86</PlatformTarget>
  • libpipi/trunk/pipi-sharp/test-csharp.csproj

    r3562 r3611  
    5555    <ProjectReference Include="pipi-sharp.csproj">
    5656      <Project>{FD11AF71-DCBE-4861-9DC6-EE4C6FD951C0}</Project>
    57       <Name>pipi-sharp</Name>
     57      <Name>pipi-sharp %28pipi-sharp\pipi-sharp%29</Name>
    5858    </ProjectReference>
    5959  </ItemGroup>
  • libpipi/trunk/src/pipi.vcproj

    r3562 r3611  
    173173        </References>
    174174        <Files>
    175                 <Filter
    176                         Name="Source Files"
    177                         Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
    178                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
     175                <File
     176                        RelativePath="..\win32\config.h"
    179177                        >
    180                         <File
    181                                 RelativePath=".\pipi.c"
    182                                 >
    183                         </File>
    184                 </Filter>
    185                 <Filter
    186                         Name="Header Files"
    187                         Filter="h;hpp;hxx;hm;inl;inc;xsd"
    188                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
     178                </File>
     179                <File
     180                        RelativePath=".\pipi.c"
    189181                        >
    190                         <File
    191                                 RelativePath="..\win32\config.h"
    192                                 >
    193                         </File>
    194                 </Filter>
     182                </File>
    195183        </Files>
    196184        <Globals>
Note: See TracChangeset for help on using the changeset viewer.