-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
-Migrated to VS2015 and fixed various build issues.
-Added missing SCULexicalCast.h -Added DirectShow BaseClasses code to lib\dshowbaseclasses so that I can always build strmbase.lib locally. Looks like MS removed samples from the Windows SDK and put them in MSDN...but didn't actually make all the samples available -_- -Removed the static dshowbaseclasses libs I had previously committed now that we build the baseclasses locally. -I still link to strmiids.lib through the Windows SDK, which should be ok since that lib just exports a bunch of GUIDs and should be pretty stable. -Changed SCU_ASSERT to Assert and AssertMsg. The new names are less typing. -Added a gitignore list.
- Loading branch information
1 parent
125b220
commit 7202ee7
Showing
48 changed files
with
29,491 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| ################################################################################ | ||
| # This .gitignore file was automatically created by Microsoft(R) Visual Studio. | ||
| ################################################################################ | ||
|
|
||
| /build | ||
| /bin | ||
| /ipch | ||
| *.sdf | ||
| *.opensdf | ||
| *.suo | ||
| *.user |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,261 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup Label="ProjectConfigurations"> | ||
| <ProjectConfiguration Include="Debug|Win32"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|Win32"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|x64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|x64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| </ItemGroup> | ||
| <PropertyGroup Label="Globals"> | ||
| <ProjectGuid>{4C5DCBF5-069D-4089-9A48-A9768A5A0A9A}</ProjectGuid> | ||
| <Keyword>Win32Proj</Keyword> | ||
| <RootNamespace>DirectShowBaseClasses</RootNamespace> | ||
| <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| <UseDebugLibraries>true</UseDebugLibraries> | ||
| <PlatformToolset>v140</PlatformToolset> | ||
| <CharacterSet>Unicode</CharacterSet> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| <UseDebugLibraries>false</UseDebugLibraries> | ||
| <PlatformToolset>v140</PlatformToolset> | ||
| <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| <CharacterSet>Unicode</CharacterSet> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
| <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| <UseDebugLibraries>true</UseDebugLibraries> | ||
| <PlatformToolset>v140</PlatformToolset> | ||
| <CharacterSet>Unicode</CharacterSet> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| <UseDebugLibraries>false</UseDebugLibraries> | ||
| <PlatformToolset>v140</PlatformToolset> | ||
| <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| <CharacterSet>Unicode</CharacterSet> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| <ImportGroup Label="ExtensionSettings"> | ||
| </ImportGroup> | ||
| <ImportGroup Label="Shared"> | ||
| </ImportGroup> | ||
| <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <PropertyGroup Label="UserMacros" /> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> | ||
| <IntDir>$(SolutionDir)build\$(Configuration)\$(ProjectName)\</IntDir> | ||
| <TargetName>Strmbasd</TargetName> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> | ||
| <IntDir>$(SolutionDir)build\$(Configuration)\$(ProjectName)\</IntDir> | ||
| <TargetName>Strmbase</TargetName> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> | ||
| <IntDir>$(SolutionDir)build\$(Configuration)\$(ProjectName)\</IntDir> | ||
| <TargetName>Strmbasd</TargetName> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> | ||
| <IntDir>$(SolutionDir)build\$(Configuration)\$(ProjectName)\</IntDir> | ||
| <TargetName>Strmbase</TargetName> | ||
| </PropertyGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| <ClCompile> | ||
| <PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
| <WarningLevel>Level4</WarningLevel> | ||
| <Optimization>Disabled</Optimization> | ||
| <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> | ||
| <AdditionalIncludeDirectories>$(ProjectDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| <TreatWarningAsError>true</TreatWarningAsError> | ||
| <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||
| <MinimalRebuild>false</MinimalRebuild> | ||
| <DisableSpecificWarnings>4996</DisableSpecificWarnings> | ||
| </ClCompile> | ||
| <Link> | ||
| <SubSystem>Windows</SubSystem> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| </Link> | ||
| <Lib> | ||
| <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> | ||
| </Lib> | ||
| </ItemDefinitionGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| <ClCompile> | ||
| <PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
| <WarningLevel>Level4</WarningLevel> | ||
| <Optimization>Disabled</Optimization> | ||
| <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> | ||
| <AdditionalIncludeDirectories>$(ProjectDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| <TreatWarningAsError>true</TreatWarningAsError> | ||
| <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||
| <MinimalRebuild>false</MinimalRebuild> | ||
| <DisableSpecificWarnings>4996</DisableSpecificWarnings> | ||
| </ClCompile> | ||
| <Link> | ||
| <SubSystem>Windows</SubSystem> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| </Link> | ||
| <Lib> | ||
| <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> | ||
| </Lib> | ||
| </ItemDefinitionGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| <ClCompile> | ||
| <WarningLevel>Level4</WarningLevel> | ||
| <PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
| <Optimization>MaxSpeed</Optimization> | ||
| <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> | ||
| <AdditionalIncludeDirectories>$(ProjectDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| <TreatWarningAsError>true</TreatWarningAsError> | ||
| <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||
| <DisableSpecificWarnings>4996</DisableSpecificWarnings> | ||
| </ClCompile> | ||
| <Link> | ||
| <SubSystem>Windows</SubSystem> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| <OptimizeReferences>true</OptimizeReferences> | ||
| </Link> | ||
| <Lib> | ||
| <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> | ||
| </Lib> | ||
| </ItemDefinitionGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| <ClCompile> | ||
| <WarningLevel>Level4</WarningLevel> | ||
| <PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
| <Optimization>MaxSpeed</Optimization> | ||
| <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> | ||
| <AdditionalIncludeDirectories>$(ProjectDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| <TreatWarningAsError>true</TreatWarningAsError> | ||
| <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||
| <DisableSpecificWarnings>4996</DisableSpecificWarnings> | ||
| </ClCompile> | ||
| <Link> | ||
| <SubSystem>Windows</SubSystem> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| <OptimizeReferences>true</OptimizeReferences> | ||
| </Link> | ||
| <Lib> | ||
| <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> | ||
| </Lib> | ||
| </ItemDefinitionGroup> | ||
| <ItemGroup> | ||
| <ClInclude Include="include\amextra.h" /> | ||
| <ClInclude Include="include\amfilter.h" /> | ||
| <ClInclude Include="include\cache.h" /> | ||
| <ClInclude Include="include\checkbmi.h" /> | ||
| <ClInclude Include="include\combase.h" /> | ||
| <ClInclude Include="include\cprop.h" /> | ||
| <ClInclude Include="include\ctlutil.h" /> | ||
| <ClInclude Include="include\ddmm.h" /> | ||
| <ClInclude Include="include\dllsetup.h" /> | ||
| <ClInclude Include="include\dxmperf.h" /> | ||
| <ClInclude Include="include\fourcc.h" /> | ||
| <ClInclude Include="include\measure.h" /> | ||
| <ClInclude Include="include\msgthrd.h" /> | ||
| <ClInclude Include="include\mtype.h" /> | ||
| <ClInclude Include="include\outputq.h" /> | ||
| <ClInclude Include="include\perflog.h" /> | ||
| <ClInclude Include="include\perfstruct.h" /> | ||
| <ClInclude Include="include\pstream.h" /> | ||
| <ClInclude Include="include\pullpin.h" /> | ||
| <ClInclude Include="include\refclock.h" /> | ||
| <ClInclude Include="include\reftime.h" /> | ||
| <ClInclude Include="include\renbase.h" /> | ||
| <ClInclude Include="include\schedule.h" /> | ||
| <ClInclude Include="include\seekpt.h" /> | ||
| <ClInclude Include="include\source.h" /> | ||
| <ClInclude Include="include\streams.h" /> | ||
| <ClInclude Include="include\strmctl.h" /> | ||
| <ClInclude Include="include\sysclock.h" /> | ||
| <ClInclude Include="include\transfrm.h" /> | ||
| <ClInclude Include="include\transip.h" /> | ||
| <ClInclude Include="include\videoctl.h" /> | ||
| <ClInclude Include="include\vtrans.h" /> | ||
| <ClInclude Include="include\winctrl.h" /> | ||
| <ClInclude Include="include\winutil.h" /> | ||
| <ClInclude Include="include\wxdebug.h" /> | ||
| <ClInclude Include="include\wxlist.h" /> | ||
| <ClInclude Include="include\wxutil.h" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClCompile Include="source\amextra.cpp" /> | ||
| <ClCompile Include="source\amfilter.cpp" /> | ||
| <ClCompile Include="source\amvideo.cpp" /> | ||
| <ClCompile Include="source\arithutil.cpp" /> | ||
| <ClCompile Include="source\combase.cpp" /> | ||
| <ClCompile Include="source\cprop.cpp" /> | ||
| <ClCompile Include="source\ctlutil.cpp" /> | ||
| <ClCompile Include="source\ddmm.cpp" /> | ||
| <ClCompile Include="source\dllentry.cpp" /> | ||
| <ClCompile Include="source\dllsetup.cpp" /> | ||
| <ClCompile Include="source\mtype.cpp" /> | ||
| <ClCompile Include="source\outputq.cpp" /> | ||
| <ClCompile Include="source\perflog.cpp" /> | ||
| <ClCompile Include="source\pstream.cpp" /> | ||
| <ClCompile Include="source\pullpin.cpp" /> | ||
| <ClCompile Include="source\refclock.cpp" /> | ||
| <ClCompile Include="source\renbase.cpp" /> | ||
| <ClCompile Include="source\schedule.cpp" /> | ||
| <ClCompile Include="source\seekpt.cpp" /> | ||
| <ClCompile Include="source\source.cpp" /> | ||
| <ClCompile Include="source\strmctl.cpp" /> | ||
| <ClCompile Include="source\sysclock.cpp" /> | ||
| <ClCompile Include="source\transfrm.cpp" /> | ||
| <ClCompile Include="source\transip.cpp" /> | ||
| <ClCompile Include="source\videoctl.cpp" /> | ||
| <ClCompile Include="source\vtrans.cpp" /> | ||
| <ClCompile Include="source\winctrl.cpp" /> | ||
| <ClCompile Include="source\winutil.cpp" /> | ||
| <ClCompile Include="source\wxdebug.cpp" /> | ||
| <ClCompile Include="source\wxlist.cpp" /> | ||
| <ClCompile Include="source\wxutil.cpp" /> | ||
| </ItemGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| <ImportGroup Label="ExtensionTargets"> | ||
| </ImportGroup> | ||
| </Project> |
Oops, something went wrong.