Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/MediaConch_Checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
pip --disable-pip-version-check install git+https://github.com/vi/mkvparse.git
fi
if [ "$RUNNER_OS" == "macOS" ]; then
brew install libtool automake libxslt jansson qt@5 sfk xmlstarlet ffmpeg
brew install libtool automake libxslt jansson qt sfk xmlstarlet ffmpeg
sudo pip --disable-pip-version-check install --prefix /usr/local git+https://github.com/vi/mkvparse.git
fi
- name: Get ZenLib info
Expand Down Expand Up @@ -89,8 +89,8 @@ jobs:
- name: Configure GUI
run: |
cd Project/Qt
export PATH=/opt/homebrew/opt/qt@5/bin:$PATH
./prepare CONFIG+=c++11 -after QMAKE_MACOSX_DEPLOYMENT_TARGET=10.9 QMAKE_LFLAGS-=-Wl,-ld_classic
export PATH=/opt/homebrew/opt/qt/bin:$PATH
./prepare -after QMAKE_MACOSX_DEPLOYMENT_TARGET=11.0
- name: Build GUI
run: |
cd Project/Qt
Expand Down
2 changes: 1 addition & 1 deletion Project/GNU/CLI/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ mediaconch_SOURCES = \
../../../Source/Checker/Checker.cpp \
../../../Source/Checker/Path.cpp \
../../../Source/IMSC1/IMSC1Plugin.cpp \
../../../Source/ThirdParty/tfsxml/tfsxml.cpp
../../../Source/ThirdParty/tfsxml/tfsxml_wrapper.cpp

#mediaconch_LDFLAGS = -no-undefined -version-info 0:0:0
mediaconch_CPPFLAGS = $(XML_CFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion Project/GNU/Library/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ lib@MediaConchLib_LibName@_la_SOURCES = \
../../../Source/Checker/Checker.cpp \
../../../Source/Checker/Path.cpp \
../../../Source/IMSC1/IMSC1Plugin.cpp \
../../../Source/ThirdParty/tfsxml/tfsxml.cpp
../../../Source/ThirdParty/tfsxml/tfsxml_wrapper.cpp

#lib@MediaConchLib_LibName@includedir = $(includedir)/MediaConch
#lib@MediaConchLib_LibName@include_HEADERS = \
Expand Down
2 changes: 1 addition & 1 deletion Project/GNU/Server/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ mediaconchd_SOURCES = \
../../../Source/Checker/Checker.cpp \
../../../Source/Checker/Path.cpp \
../../../Source/IMSC1/IMSC1Plugin.cpp \
../../../Source/ThirdParty/tfsxml/tfsxml.cpp
../../../Source/ThirdParty/tfsxml/tfsxml_wrapper.cpp

#mediaconchd_LDFLAGS = -no-undefined -version-info 0:0:0
mediaconchd_CPPFLAGS = $(XML_CFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion Project/MSVC2022/CLI/MediaConch.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
<ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
<ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
<ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml_wrapper.cpp" />
<ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
</ItemGroup>
<ItemGroup>
Expand Down
309 changes: 309 additions & 0 deletions Project/MSVC2022/DLL/MediaConch-DLL.vcxproj

Large diffs are not rendered by default.

332 changes: 332 additions & 0 deletions Project/MSVC2022/DLL/MediaConch-DLL.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,332 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Source Files\Lib">
<UniqueIdentifier>{3ae77992-ac1e-4f84-9b70-b9b52ce3b46a}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Common">
<UniqueIdentifier>{04e8d873-200e-44c5-843e-432f681438f8}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Header Files\Lib">
<UniqueIdentifier>{4144b785-9e42-4b50-b521-d1f949969234}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Common">
<UniqueIdentifier>{0e3aa0e0-c270-4d91-87ae-50c30aad50c0}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
<Filter Include="ThirdParty">
<UniqueIdentifier>{17d3f297-ae83-44c2-be09-2e2882b1565a}</UniqueIdentifier>
</Filter>
<Filter Include="ThirdParty\sqlite">
<UniqueIdentifier>{3c62d1d8-29ba-45c4-8828-7a5e54664aa9}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Source\Lib\Lib.cpp">
<Filter>Source Files\Lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Lib\MediaConchDLL.cpp">
<Filter>Source Files\Lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Core.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Schema.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Policy.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Policies.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Database.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Http.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Json.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Queue.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
<Filter>ThirdParty\sqlite</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Common\Reports.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Source\Lib\Lib.h">
<Filter>Header Files\Lib</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Lib\MediaConchDLL.h">
<Filter>Header Files\Lib</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Core.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Policies.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Policy.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
<Filter>ThirdParty\sqlite</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\DpfManager.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Plugin.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Configuration.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Container.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Database.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Http.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Httpd.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Json.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\NoContainer.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\PluginLog.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Queue.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\REST_API.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Scheduler.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Schema.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\SQLLite.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Xslt.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Common\Reports.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="MediaConch_DLL.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
Loading
Loading