diff --git a/.clang-format b/.clang-format index bdd3f26..74104d2 100644 --- a/.clang-format +++ b/.clang-format @@ -35,7 +35,7 @@ BreakBeforeTernaryOperators: true BreakConstructorInitializers: BeforeComma BreakInheritanceList: BeforeComma BreakStringLiterals: false -ColumnLimit: 200 +ColumnLimit: 180 CompactNamespaces: false ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 @@ -78,7 +78,7 @@ ObjCBreakBeforeNestedBlockParam: true ObjCSpaceAfterProperty: false ObjCSpaceBeforeProtocolList: false PPIndentWidth: -1 -PackConstructorInitializers: Never # change to NextLineOnly when v17 is available +PackConstructorInitializers: NextLineOnly PenaltyBreakAssignment: 1000 PenaltyBreakBeforeFirstCallParameter: 1000 PenaltyBreakComment: 300 diff --git a/.gitignore b/.gitignore index 162bd9d..babc4c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,370 +1,14 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo +.vs/ +*.aps *.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ +Win32/ x64/ x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Oo]ut/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -/wiki/ -/dep_*/ -release*.cmd -*.zip *.sln.startup.json +*.zip +/dep_*/ /filter_common/src/git_hash.h +/wiki/ +release*.cmd +scripts/ diff --git a/avisynth_filter.sln b/avisynth_filter.sln index d4824ae..9a74dfb 100644 --- a/avisynth_filter.sln +++ b/avisynth_filter.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31205.134 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.35122.118 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avisynth_filter", "avisynth_filter\avisynth_filter.vcxproj", "{C84DE615-CF6F-441C-99B8-E30F5046CF9F}" EndProject @@ -12,43 +12,46 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vapoursynth_filter", "vapoursynth_filter\vapoursynth_filter.vcxproj", "{A736C512-27B1-4D1C-B8E4-50EF31FE13AF}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - filter_common\filter_common.vcxitems*{c84de615-cf6f-441c-99b8-e30f5046cf9f}*SharedItemsImports = 4 - filter_common\filter_common.vcxitems*{a736c512-27b1-4d1c-b8e4-50ef31fe13af}*SharedItemsImports = 4 - filter_common\filter_common.vcxitems*{30836ddb-efab-421e-98ef-ea3bed0d83c1}*SharedItemsImports = 9 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Debug|x64.ActiveCfg = Debug|x64 - {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Debug|x64.Build.0 = Debug|x64 - {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Debug|x86.ActiveCfg = Debug|Win32 - {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Debug|x86.Build.0 = Debug|Win32 - {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Release|x64.ActiveCfg = Release|x64 - {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Release|x64.Build.0 = Release|x64 - {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Release|x86.ActiveCfg = Release|Win32 - {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Release|x86.Build.0 = Release|Win32 - {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Debug|x64.ActiveCfg = Debug|x64 - {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Debug|x64.Build.0 = Debug|x64 - {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Debug|x86.ActiveCfg = Debug|Win32 - {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Debug|x86.Build.0 = Debug|Win32 - {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Release|x64.ActiveCfg = Release|x64 - {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Release|x64.Build.0 = Release|x64 - {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Release|x86.ActiveCfg = Release|Win32 - {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Release|x86.Build.0 = Release|Win32 - {A736C512-27B1-4D1C-B8E4-50EF31FE13AF}.Debug|x64.ActiveCfg = Debug|x64 - {A736C512-27B1-4D1C-B8E4-50EF31FE13AF}.Debug|x64.Build.0 = Debug|x64 - {A736C512-27B1-4D1C-B8E4-50EF31FE13AF}.Release|x64.ActiveCfg = Release|x64 - {A736C512-27B1-4D1C-B8E4-50EF31FE13AF}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DB631A51-C455-4404-AD0C-4B2898CAD993} - EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Debug|x64.ActiveCfg = Debug|x64 + {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Debug|x64.Build.0 = Debug|x64 + {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Debug|x86.ActiveCfg = Debug|Win32 + {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Debug|x86.Build.0 = Debug|Win32 + {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Release|x64.ActiveCfg = Release|x64 + {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Release|x64.Build.0 = Release|x64 + {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Release|x86.ActiveCfg = Release|Win32 + {C84DE615-CF6F-441C-99B8-E30F5046CF9F}.Release|x86.Build.0 = Release|Win32 + {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Debug|x64.ActiveCfg = Debug|x64 + {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Debug|x64.Build.0 = Debug|x64 + {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Debug|x86.ActiveCfg = Debug|Win32 + {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Debug|x86.Build.0 = Debug|Win32 + {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Release|x64.ActiveCfg = Release|x64 + {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Release|x64.Build.0 = Release|x64 + {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Release|x86.ActiveCfg = Release|Win32 + {6D6FABA3-51A7-4162-B5A8-ADA838387D60}.Release|x86.Build.0 = Release|Win32 + {A736C512-27B1-4D1C-B8E4-50EF31FE13AF}.Debug|x64.ActiveCfg = Debug|x64 + {A736C512-27B1-4D1C-B8E4-50EF31FE13AF}.Debug|x64.Build.0 = Debug|x64 + {A736C512-27B1-4D1C-B8E4-50EF31FE13AF}.Debug|x86.ActiveCfg = Debug|x64 + {A736C512-27B1-4D1C-B8E4-50EF31FE13AF}.Release|x64.ActiveCfg = Release|x64 + {A736C512-27B1-4D1C-B8E4-50EF31FE13AF}.Release|x64.Build.0 = Release|x64 + {A736C512-27B1-4D1C-B8E4-50EF31FE13AF}.Release|x86.ActiveCfg = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C060DE0E-A624-46A4-9C99-1E7ADE26A948} + SolutionGuid = {DB631A51-C455-4404-AD0C-4B2898CAD993} + EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + filter_common\filter_common.vcxitems*{30836ddb-efab-421e-98ef-ea3bed0d83c1}*SharedItemsImports = 9 + filter_common\filter_common.vcxitems*{a736c512-27b1-4d1c-b8e4-50ef31fe13af}*SharedItemsImports = 4 + filter_common\filter_common.vcxitems*{c84de615-cf6f-441c-99b8-e30f5046cf9f}*SharedItemsImports = 4 + EndGlobalSection EndGlobal diff --git a/avisynth_filter/avisynth_filter.vcxproj b/avisynth_filter/avisynth_filter.vcxproj index 7c9671e..9d8710d 100644 --- a/avisynth_filter/avisynth_filter.vcxproj +++ b/avisynth_filter/avisynth_filter.vcxproj @@ -3,6 +3,24 @@ {C84DE615-CF6F-441C-99B8-E30F5046CF9F} + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + DynamicLibrary diff --git a/baseclasses/baseclasses.vcxproj b/baseclasses/baseclasses.vcxproj index 5ad16e3..1ee17f4 100644 --- a/baseclasses/baseclasses.vcxproj +++ b/baseclasses/baseclasses.vcxproj @@ -75,6 +75,24 @@ {6D6FABA3-51A7-4162-B5A8-ADA838387D60} + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + StaticLibrary @@ -82,4 +100,4 @@ - \ No newline at end of file + diff --git a/common.props b/common.props index 88d0044..9e05341 100644 --- a/common.props +++ b/common.props @@ -1,22 +1,4 @@ - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - $(Platform)\$(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\ diff --git a/vapoursynth_filter/vapoursynth_filter.vcxproj b/vapoursynth_filter/vapoursynth_filter.vcxproj index b7ae1c4..9833f61 100644 --- a/vapoursynth_filter/vapoursynth_filter.vcxproj +++ b/vapoursynth_filter/vapoursynth_filter.vcxproj @@ -3,6 +3,16 @@ {A736C512-27B1-4D1C-B8E4-50EF31FE13AF} + + + Debug + x64 + + + Release + x64 + + DynamicLibrary