Skip to content
Open
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
9 changes: 8 additions & 1 deletion .github/workflows/MediaInfo-Android_Checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ jobs:
Ubuntu:
runs-on: ubuntu-latest
steps:
- name: Checkout brotli
uses: actions/checkout@v6
with:
repository: cjee21/brotli #!! TO CHANGE !!
ref: MSVC #!! TO REMOVE !!
path: brotli
- name: Checkout zlib
uses: actions/checkout@v6
with:
Expand All @@ -32,7 +38,8 @@ jobs:
- name: Checkout MediaInfoLib
uses: actions/checkout@v6
with:
repository: MediaArea/MediaInfoLib
repository: cjee21/MediaInfoLib #!! TO CHANGE !!
ref: jxl #!! TO REMOVE !!
path: MediaInfoLib
- name: Checkout MediaInfo
uses: actions/checkout@v6
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/MediaInfo-Qt_Checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ jobs:
name: Windows (${{ matrix.architecture }})
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout brotli
uses: actions/checkout@v6
with:
repository: cjee21/brotli #!! TO CHANGE !!
ref: MSVC #!! TO REMOVE !!
path: brotli
- name: Checkout zlib
uses: actions/checkout@v6
with:
Expand All @@ -48,7 +54,8 @@ jobs:
- name: Checkout MediaInfoLib
uses: actions/checkout@v6
with:
repository: MediaArea/MediaInfoLib
repository: cjee21/MediaInfoLib #!! TO CHANGE !!
ref: jxl #!! TO REMOVE !!
path: MediaInfoLib
- name: Checkout MediaInfo
uses: actions/checkout@v6
Expand Down
30 changes: 24 additions & 6 deletions .github/workflows/MediaInfo_Checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
sudo apt-get update -y
sudo apt-get install -y zlib1g-dev libwxgtk3.2-dev
sudo apt-get install -y libbrotli-dev zlib1g-dev libwxgtk3.2-dev
fi
if [ "$RUNNER_OS" == "macOS" ]; then
brew install libtool automake wxmac
Expand All @@ -40,7 +40,7 @@ jobs:
popd
- name: MediaInfoLib
run: |
git -C .. clone --depth=1 https://github.com/MediaArea/MediaInfoLib.git
git -C .. clone --depth=1 -b jxl https://github.com/cjee21/MediaInfoLib.git #!! TO CHANGE !!
pushd ../MediaInfoLib/Project/GNU/Library
autoreconf -if
./configure --enable-static
Expand Down Expand Up @@ -97,6 +97,12 @@ jobs:
name: Windows (${{ matrix.architecture }})
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout brotli
uses: actions/checkout@v6
with:
repository: cjee21/brotli #!! TO CHANGE !!
ref: MSVC #!! TO REMOVE !!
path: brotli
- name: Checkout zlib
uses: actions/checkout@v6
with:
Expand All @@ -110,7 +116,8 @@ jobs:
- name: Checkout MediaInfoLib
uses: actions/checkout@v6
with:
repository: MediaArea/MediaInfoLib
repository: cjee21/MediaInfoLib #!! TO CHANGE !!
ref: jxl #!! TO REMOVE !!
path: MediaInfoLib
- name: Checkout MediaInfo
uses: actions/checkout@v6
Expand Down Expand Up @@ -166,6 +173,13 @@ jobs:
env:
CXXFLAGS: ${{ matrix.CXXFLAGS }}
steps:
- name: Checkout brotli
if: ${{ matrix.type == 'Windows (DLL) (x64)' }}
uses: actions/checkout@v6
with:
repository: cjee21/brotli #!! TO CHANGE !!
ref: MSVC #!! TO REMOVE !!
path: brotli
- name: Checkout zlib
if: ${{ matrix.type == 'Windows (DLL) (x64)' }}
uses: actions/checkout@v6
Expand All @@ -182,7 +196,8 @@ jobs:
if: ${{ matrix.type == 'Windows (DLL) (x64)' }}
uses: actions/checkout@v6
with:
repository: MediaArea/MediaInfoLib
repository: cjee21/MediaInfoLib #!! TO CHANGE !!
ref: jxl #!! TO REMOVE !!
path: MediaInfoLib
- name: Checkout MediaInfo
uses: actions/checkout@v6
Expand All @@ -196,17 +211,20 @@ jobs:
- name: Build dependencies
if: ${{ matrix.type == 'Windows (DLL) (x64)' }}
run: |
cmake -G Ninja -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=./cmake-prefix/ -B build-brotli ./brotli/
cmake --build build-brotli
cmake --install build-brotli
cmake -G Ninja -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=./cmake-prefix/ -B build-zlib ./zlib/
cmake --build build-zlib
cmake --install build-zlib
cmake -G Ninja -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=./cmake-prefix/ -B build-zenlib ./ZenLib/Project/CMake/
cmake --build build-zenlib
cmake --install build-zenlib
cmake -G Ninja -D CMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=./cmake-prefix/ -D CMAKE_INSTALL_PREFIX=./cmake-prefix/ -D BUILD_ZLIB=OFF -D BUILD_ZENLIB=OFF -D BUILD_SHARED_LIBS=ON -B build-mediainfolib ./MediaInfoLib/Project/CMake/
cmake -G Ninja -D CMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=./cmake-prefix/ -D CMAKE_INSTALL_PREFIX=./cmake-prefix/ -D BUILD_BROTLI=OFF -D BUILD_ZLIB=OFF -D BUILD_ZENLIB=OFF -D BUILD_SHARED_LIBS=ON -B build-mediainfolib ./MediaInfoLib/Project/CMake/
cmake --build build-mediainfolib
cmake --install build-mediainfolib
- name: Configure CLI
run: cmake -G Ninja -D CMAKE_PREFIX_PATH=./cmake-prefix/ -D CMAKE_INSTALL_PREFIX=./cmake-prefix/ -D CMAKE_BUILD_TYPE=Release ${{ matrix.type == 'Windows (DLL) (x64)' && '-D MEDIAINFO_CLI_STATIC=OFF' || '-D BUILD_ZENLIB=ON -D BUILD_ZLIB=ON -D ZLIB_BUILD_SHARED=OFF -D ZLIB_BUILD_TESTING=OFF' }} -B build ./MediaInfo/Project/CMake/CLI/
run: cmake -G Ninja -D CMAKE_PREFIX_PATH=./cmake-prefix/ -D CMAKE_INSTALL_PREFIX=./cmake-prefix/ -D CMAKE_BUILD_TYPE=Release ${{ matrix.type == 'Windows (DLL) (x64)' && '-D MEDIAINFO_CLI_STATIC=OFF' || '-D BUILD_BROTLI=ON -D BUILD_ZENLIB=ON -D BUILD_ZLIB=ON -D ZLIB_BUILD_SHARED=OFF -D ZLIB_BUILD_TESTING=OFF' }} -B build ./MediaInfo/Project/CMake/CLI/
- name: Build CLI
run: cmake --build build
- name: Install CLI
Expand Down
3 changes: 3 additions & 0 deletions Project/CMake/CLI/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ if(MEDIAINFO_CLI_STATIC)
message(STATUS "Found local ${NAME} at ${LOCAL_PATH}")
endif()
endmacro()
if(WIN32 OR BUILD_BROTLI)
ensure_dependency(Brotli "https://github.com/MediaArea/brotli.git" "${CMAKE_CURRENT_SOURCE_DIR}/../../../../brotli" "")
endif()
if(WIN32 OR BUILD_ZLIB)
ensure_dependency(zlib "https://github.com/MediaArea/zlib.git" "${CMAKE_CURRENT_SOURCE_DIR}/../../../../zlib" "")
endif()
Expand Down
2 changes: 2 additions & 0 deletions Project/MSVC2022/MediaInfo-NoGUI.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"..\\..\\..\\MediaInfoLib\\Project\\MSVC2022\\Library\\MediaInfoLib.vcxproj",
"..\\..\\..\\MediaInfoLib\\Project\\MSVC2022\\RegressionTest\\RegressionTest.vcxproj",
"..\\..\\..\\ZenLib\\Project\\MSVC2022\\Library\\ZenLib.vcxproj",
"..\\..\\..\\brotli\\Project\\MSVC2022\\brotlicommon.vcxproj",
"..\\..\\..\\brotli\\Project\\MSVC2022\\brotlidec.vcxproj",
"..\\..\\..\\zlib\\contrib\\vstudio\\vc17\\zlibstat.vcxproj",
"CLI\\MediaInfo-CLI.vcxproj",
"MediaInfo_PackageHelper\\MediaInfo_PackageHelper.vcxproj",
Expand Down
38 changes: 38 additions & 0 deletions Project/MSVC2022/MediaInfo.sln
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaInfo_PackageHelper", "
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PreRelease", "PreRelease\PreRelease.vcxproj", "{8B437426-D6E6-4E43-834F-2DD93E221D23}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brotlidec", "..\..\..\brotli\Project\MSVC2022\brotlidec.vcxproj", "{ABD0C651-F2D8-3560-9313-6DF99D388406}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brotlicommon", "..\..\..\brotli\Project\MSVC2022\brotlicommon.vcxproj", "{A2C733D0-0511-3374-AB76-169FAFC276BC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Expand Down Expand Up @@ -315,6 +319,38 @@ Global
{8B437426-D6E6-4E43-834F-2DD93E221D23}.Release|Win32.Build.0 = Release|Win32
{8B437426-D6E6-4E43-834F-2DD93E221D23}.Release|x64.ActiveCfg = Release|x64
{8B437426-D6E6-4E43-834F-2DD93E221D23}.Release|x64.Build.0 = Release|x64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Debug|ARM.ActiveCfg = Debug|x64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Debug|ARM.Build.0 = Debug|x64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Debug|ARM64.ActiveCfg = Debug|ARM64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Debug|ARM64.Build.0 = Debug|ARM64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Debug|Win32.ActiveCfg = Debug|Win32
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Debug|Win32.Build.0 = Debug|Win32
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Debug|x64.ActiveCfg = Debug|x64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Debug|x64.Build.0 = Debug|x64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Release|ARM.ActiveCfg = Release|x64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Release|ARM.Build.0 = Release|x64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Release|ARM64.ActiveCfg = Release|ARM64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Release|ARM64.Build.0 = Release|ARM64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Release|Win32.ActiveCfg = Release|Win32
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Release|Win32.Build.0 = Release|Win32
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Release|x64.ActiveCfg = Release|x64
{ABD0C651-F2D8-3560-9313-6DF99D388406}.Release|x64.Build.0 = Release|x64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Debug|ARM.ActiveCfg = Debug|x64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Debug|ARM.Build.0 = Debug|x64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Debug|ARM64.ActiveCfg = Debug|ARM64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Debug|ARM64.Build.0 = Debug|ARM64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Debug|Win32.ActiveCfg = Debug|Win32
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Debug|Win32.Build.0 = Debug|Win32
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Debug|x64.ActiveCfg = Debug|x64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Debug|x64.Build.0 = Debug|x64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Release|ARM.ActiveCfg = Release|x64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Release|ARM.Build.0 = Release|x64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Release|ARM64.ActiveCfg = Release|ARM64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Release|ARM64.Build.0 = Release|ARM64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Release|Win32.ActiveCfg = Release|Win32
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Release|Win32.Build.0 = Release|Win32
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Release|x64.ActiveCfg = Release|x64
{A2C733D0-0511-3374-AB76-169FAFC276BC}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -330,6 +366,8 @@ Global
{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} = {04D93003-160A-4F76-9E90-B069C508F134}
{01F4CE10-2CFB-41A8-B41F-E54337868A1D} = {04D93003-160A-4F76-9E90-B069C508F134}
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
{ABD0C651-F2D8-3560-9313-6DF99D388406} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
{A2C733D0-0511-3374-AB76-169FAFC276BC} = {70DAF034-E8BA-4636-A42C-CC581B3ECC94}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6B8141D6-6E8C-44D3-B809-1CC53A8DE0BF}
Expand Down
2 changes: 2 additions & 0 deletions Project/MSVC2026/MediaInfo-NoGUI.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"..\\..\\..\\MediaInfoLib\\Project\\MSVC2026\\Library\\MediaInfoLib.vcxproj",
"..\\..\\..\\MediaInfoLib\\Project\\MSVC2026\\RegressionTest\\RegressionTest.vcxproj",
"..\\..\\..\\ZenLib\\Project\\MSVC2026\\Library\\ZenLib.vcxproj",
"..\\..\\..\\brotli\\Project\\MSVC2026\\brotlicommon.vcxproj",
"..\\..\\..\\brotli\\Project\\MSVC2026\\brotlidec.vcxproj",
"..\\..\\..\\zlib\\contrib\\vstudio\\vc18\\zlibstat.vcxproj",
"CLI\\MediaInfo-CLI.vcxproj",
"MediaInfo_PackageHelper\\MediaInfo_PackageHelper.vcxproj",
Expand Down
6 changes: 6 additions & 0 deletions Project/MSVC2026/MediaInfo.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
<Project Path="../../../ZenLib/Project/MSVC2026/Library/ZenLib.vcxproj" Id="0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94" />
</Folder>
<Folder Name="/ThirdParty/">
<Project Path="../../../brotli/Project/MSVC2026/brotlicommon.vcxproj" Id="a2c733d0-0511-3374-ab76-169fafc276bc">
<Platform Solution="*|ARM" Project="x64" />
</Project>
<Project Path="../../../brotli/Project/MSVC2026/brotlidec.vcxproj" Id="abd0c651-f2d8-3560-9313-6df99d388406">
<Platform Solution="*|ARM" Project="x64" />
</Project>
<Project Path="../../../zlib/contrib/vstudio/vc18/zlibstat.vcxproj" Id="745dec58-ebb3-47a9-a9b8-4c6627c01bf8">
<BuildType Solution="Release|*" Project="ReleaseWithoutAsm" />
</Project>
Expand Down
45 changes: 45 additions & 0 deletions Project/QMake/GUI/MediaInfoQt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,21 @@ win32 {
}
}

exists(../../../../brotli/Project/$$MSVCVER/Win32/Release/brotlidec.lib) {
INCLUDEPATH += ../../../../brotli/c/include
LIBS += $$PWD/../../../../brotli/Project/$$MSVCVER/Win32/Release/brotlicommon.lib
LIBS += $$PWD/../../../../brotli/Project/$$MSVCVER/Win32/Release/brotlidec.lib
} else {
exists(../../../../MediaInfoLib/Project/$$MSVCVER/Win32/Release/brotlidec.lib) {
!build_pass:message("using brotlidec.lib from MediaInfoLib build")
INCLUDEPATH += ../../../../brotli/c/include
LIBS += $$PWD/../../../../MediaInfoLib/Project/$$MSVCVER/Win32/Release/brotlicommon.lib
LIBS += $$PWD/../../../../MediaInfoLib/Project/$$MSVCVER/Win32/Release/brotlidec.lib
} else {
error("brotli not found on system")
}
}

exists(../../../../zlib/contrib/vstudio/$$MSVCVERN/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib) {
INCLUDEPATH += ../../../../zlib
LIBS += $$PWD/../../../../zlib/contrib/vstudio/$$MSVCVERN/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib
Expand Down Expand Up @@ -245,6 +260,21 @@ win32 {
}
}

exists(../../../../brotli/Project/$$MSVCVER/x64/Release/brotlidec.lib) {
INCLUDEPATH += ../../../../brotli/c/include
LIBS += $$PWD/../../../../brotli/Project/$$MSVCVER/x64/Release/brotlicommon.lib
LIBS += $$PWD/../../../../brotli/Project/$$MSVCVER/x64/Release/brotlidec.lib
} else {
exists(../../../../MediaInfoLib/Project/$$MSVCVER/x64/Release/brotlidec.lib) {
!build_pass:message("using brotlidec.lib from MediaInfoLib build")
INCLUDEPATH += ../../../../brotli/c/include
LIBS += $$PWD/../../../../MediaInfoLib/Project/$$MSVCVER/x64/Release/brotlicommon.lib
LIBS += $$PWD/../../../../MediaInfoLib/Project/$$MSVCVER/x64/Release/brotlidec.lib
} else {
error("brotli not found on system")
}
}

exists(../../../../zlib/contrib/vstudio/$$MSVCVERN/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib) {
INCLUDEPATH += ../../../../zlib
LIBS += $$PWD/../../../../zlib/contrib/vstudio/$$MSVCVERN/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib
Expand Down Expand Up @@ -294,6 +324,21 @@ win32 {
}
}

exists(../../../../brotli/Project/$$MSVCVER/ARM64/Release/brotlidec.lib) {
INCLUDEPATH += ../../../../brotli/c/include
LIBS += $$PWD/../../../../brotli/Project/$$MSVCVER/ARM64/Release/brotlicommon.lib
LIBS += $$PWD/../../../../brotli/Project/$$MSVCVER/ARM64/Release/brotlidec.lib
} else {
exists(../../../../MediaInfoLib/Project/$$MSVCVER/ARM64/Release/brotlidec.lib) {
!build_pass:message("using brotlidec.lib from MediaInfoLib build")
INCLUDEPATH += ../../../../brotli/c/include
LIBS += $$PWD/../../../../MediaInfoLib/Project/$$MSVCVER/ARM64/Release/brotlicommon.lib
LIBS += $$PWD/../../../../MediaInfoLib/Project/$$MSVCVER/ARM64/Release/brotlidec.lib
} else {
error("brotli not found on system")
}
}

exists(../../../../zlib/contrib/vstudio/$$MSVCVERN/arm64/ZlibStatReleaseWithoutAsm/zlibstat.lib) {
INCLUDEPATH += ../../../../zlib
LIBS += $$PWD/../../../../zlib/contrib/vstudio/$$MSVCVERN/arm64/ZlibStatReleaseWithoutAsm/zlibstat.lib
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Create an empty folder and clone the following repositories using Git or GitHub
- This repository (<https://github.com/MediaArea/MediaInfo>)
- <https://github.com/MediaArea/MediaInfoLib>
- <https://github.com/MediaArea/ZenLib>
- <https://github.com/MediaArea/brotli>
- <https://github.com/MediaArea/zlib>

If you need Curl or the Graph Plugin, they may be obtained from [MediaArea-Utils-Binaries](https://github.com/MediaArea/MediaArea-Utils-Binaries) and [MediaInfo-Graph-Plugin-Binaries](https://github.com/MediaArea/MediaInfo-Graph-Plugin-Binaries) respectively.
Expand Down Expand Up @@ -224,6 +225,7 @@ port install autoconf automake libtool pkgconfig zlib wxWidgets-3.0

*CLI and GUI dependencies*

- brotli
- zlib

*GUI only dependencies*
Expand All @@ -235,7 +237,7 @@ port install autoconf automake libtool pkgconfig zlib wxWidgets-3.0
*Build tools and CLI/GUI dependencies*

```sh
apt-get install git automake autoconf libtool pkg-config make g++ zlib1g-dev
apt-get install git automake autoconf libtool pkg-config make g++ libbrotli-dev zlib1g-dev
```

*MediaArea tools*
Expand All @@ -257,7 +259,7 @@ apt-get install libwxgtk3.2-dev
*Build tools and CLI/GUI dependencies*

```sh
sudo yum install git automake autoconf libtool pkgconfig make gcc-c++ zlib-devel
sudo yum install git automake autoconf libtool pkgconfig make gcc-c++ brotli-devel zlib-devel
```

*MediaArea tools*
Expand All @@ -279,7 +281,7 @@ sudo yum install wxGTK-devel desktop-file-utils
*Build tools and CLI/GUI dependencies*

```sh
apt-get install git automake autoconf libtool pkg-config make g++ zlib1g-dev
apt-get install git automake autoconf libtool pkg-config make g++ libbrotli-dev zlib1g-dev
```

*MediaArea tools*
Expand All @@ -301,7 +303,7 @@ apt-get install libwxgtk3.0-dev
*Build tools and CLI/GUI dependencies*

```sh
zypper install git automake autoconf libtool pkgconfig make gcc-c++ zlib-devel
zypper install git automake autoconf libtool pkgconfig make gcc-c++ brotli-devel zlib-devel
```

*MediaArea tools*
Expand Down Expand Up @@ -462,7 +464,7 @@ To build statically-linked MediaInfo CLI with CMake, create a new directory and

```bash
git clone https://github.com/MediaArea/MediaInfo.git
cmake -G Ninja -D CMAKE_PREFIX_PATH=./install/ -D CMAKE_INSTALL_PREFIX=./install/ -D CMAKE_BUILD_TYPE=Release -D BUILD_ZENLIB=ON -D BUILD_ZLIB=ON -D ZLIB_BUILD_SHARED=OFF -D ZLIB_BUILD_TESTING=OFF -B build ./MediaInfo/Project/CMake/CLI/
cmake -G Ninja -D CMAKE_PREFIX_PATH=./install/ -D CMAKE_INSTALL_PREFIX=./install/ -D CMAKE_BUILD_TYPE=Release -D BUILD_ZENLIB=ON -D BUILD_BROTLI=ON -D BUILD_ZLIB=ON -D ZLIB_BUILD_SHARED=OFF -D ZLIB_BUILD_TESTING=OFF -B build ./MediaInfo/Project/CMake/CLI/
cmake --build build
cmake --install build
```
Expand Down
5 changes: 5 additions & 0 deletions Release/Build_CLI_Windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ switch ($msvc) {

#-----------------------------------------------------------------------
# Prepare
Push-Location -Path "${release_directory}\..\..\brotli\Project\$msvc"
((Get-Content -Path brotlicommon.vcxproj) -Replace 'MultiThreadedDLL','MultiThreaded') | Set-Content -Path brotlicommon.vcxproj
((Get-Content -Path brotlidec.vcxproj) -Replace 'MultiThreadedDLL','MultiThreaded') | Set-Content -Path brotlidec.vcxproj
Pop-Location

Push-Location -Path "${release_directory}\..\..\zlib\contrib\vstudio\$vc"
((Get-Content -Path zlibstat.vcxproj) -Replace 'MultiThreadedDLL','MultiThreaded') | Set-Content -Path zlibstat.vcxproj
Pop-Location
Expand Down
Loading
Loading