From f5ecf6fed0ff77d8cd00320fc10bd3b034e0ce8e Mon Sep 17 00:00:00 2001 From: Andrew Hoefling Date: Tue, 1 Feb 2022 10:56:31 -0500 Subject: [PATCH 1/2] Added libde265 and removed vcpkg --- BUILDING.md | 2 +- build/libde265.bat | 10 +++++++ build/libheif.bat | 4 +-- .../Build/libde265.targets | 28 +++++++++++++++++++ .../Build/libheif.targets | 15 +--------- .../FileOnQ.Imaging.Heif.csproj | 3 +- 6 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 build/libde265.bat create mode 100644 src/FileOnQ.Imaging.Heif/Build/libde265.targets diff --git a/BUILDING.md b/BUILDING.md index 72dec6a..0b892c8 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -31,7 +31,7 @@ C:\Program Files\Meson *In our environment `nasm` was not automatically added to the path, but the other dependencies were* ## Compile -First time compilation takes a very long time, after you start the build go grab a cup of ☕ or 🍵. Our build agent runs the entire clean build in about 25-35 minutes, your build times may vary. Future builds won't take as long even if you do a clean and rebuild as vcpkg will cache binaries in your user directory. +First time compilation takes a very long time, after you start the build go grab a cup of ☕ or 🍵. Our build agent runs the entire clean build in about 25-35 minutes, your build times may vary. By compiling the main project `FileOnQ.Imaging.Heif` you will be compiling all native dependencies including the C++ encoding library `FileOnQ.Imaging.Heif.Encoders`. No need to run any additional compilation instructions. diff --git a/build/libde265.bat b/build/libde265.bat new file mode 100644 index 0000000..8f7b0cd --- /dev/null +++ b/build/libde265.bat @@ -0,0 +1,10 @@ +@echo off +title Building libde265 +set arch=%1 +set config=%2 +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %arch% +cd ../third-party/libde265-%arch% +mkdir build +cd build +cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=%config% .. +nmake \ No newline at end of file diff --git a/build/libheif.bat b/build/libheif.bat index d7c8c6d..1038eef 100644 --- a/build/libheif.bat +++ b/build/libheif.bat @@ -16,8 +16,8 @@ cmake -G"NMake Makefiles"^ -DJPEG_INCLUDE_DIR:PATH=%thirdPartyPath%\libjpeg-turbo-%arch%^ -DJPEG_LIBRARY_DEBUG:FILEPATH=%thirdPartyPath%\libjpeg-turbo-%arch%\jpeg.lib^ -DJPEG_LIBRARY_RELEASE:FILEPATH=%thirdPartyPath%\libjpeg-turbo-%arch%\jpeg.lib^ - -DLIBDE265_INCLUDE_DIR:PATH=%thirdPartyPath%\vcpkg\installed\%arch%-windows\include^ - -DLIBDE265_LIBRARY:FILEPATH=%thirdPartyPath%\vcpkg\installed\%arch%-windows\lib\libde265.lib^ + -DLIBDE265_INCLUDE_DIR:PATH=%thirdPartyPath%\libde265-%arch%\build^ + -DLIBDE265_LIBRARY:FILEPATH=%thirdPartyPath%\libde265-%arch%\build\libde265\libde265.lib^ .. nmake \ No newline at end of file diff --git a/src/FileOnQ.Imaging.Heif/Build/libde265.targets b/src/FileOnQ.Imaging.Heif/Build/libde265.targets new file mode 100644 index 0000000..50d529f --- /dev/null +++ b/src/FileOnQ.Imaging.Heif/Build/libde265.targets @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/FileOnQ.Imaging.Heif/Build/libheif.targets b/src/FileOnQ.Imaging.Heif/Build/libheif.targets index d2d1c69..8ead888 100644 --- a/src/FileOnQ.Imaging.Heif/Build/libheif.targets +++ b/src/FileOnQ.Imaging.Heif/Build/libheif.targets @@ -23,11 +23,7 @@ - - - - - + @@ -40,20 +36,11 @@ - - - - - - - - - diff --git a/src/FileOnQ.Imaging.Heif/FileOnQ.Imaging.Heif.csproj b/src/FileOnQ.Imaging.Heif/FileOnQ.Imaging.Heif.csproj index ffb23eb..2419428 100644 --- a/src/FileOnQ.Imaging.Heif/FileOnQ.Imaging.Heif.csproj +++ b/src/FileOnQ.Imaging.Heif/FileOnQ.Imaging.Heif.csproj @@ -13,7 +13,8 @@ - + + From da66998e8b186da729b502f118245bae3c342b70 Mon Sep 17 00:00:00 2001 From: Andrew Hoefling Date: Tue, 1 Feb 2022 11:22:00 -0500 Subject: [PATCH 2/2] Updated compile path for libde265 to work with libheif --- build/libde265.bat | 4 +--- build/libheif.bat | 4 ++-- src/FileOnQ.Imaging.Heif/Build/libde265.targets | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build/libde265.bat b/build/libde265.bat index 8f7b0cd..610f85a 100644 --- a/build/libde265.bat +++ b/build/libde265.bat @@ -4,7 +4,5 @@ set arch=%1 set config=%2 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %arch% cd ../third-party/libde265-%arch% -mkdir build -cd build -cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=%config% .. +cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=%config% . nmake \ No newline at end of file diff --git a/build/libheif.bat b/build/libheif.bat index 1038eef..f82d2e8 100644 --- a/build/libheif.bat +++ b/build/libheif.bat @@ -16,8 +16,8 @@ cmake -G"NMake Makefiles"^ -DJPEG_INCLUDE_DIR:PATH=%thirdPartyPath%\libjpeg-turbo-%arch%^ -DJPEG_LIBRARY_DEBUG:FILEPATH=%thirdPartyPath%\libjpeg-turbo-%arch%\jpeg.lib^ -DJPEG_LIBRARY_RELEASE:FILEPATH=%thirdPartyPath%\libjpeg-turbo-%arch%\jpeg.lib^ - -DLIBDE265_INCLUDE_DIR:PATH=%thirdPartyPath%\libde265-%arch%\build^ - -DLIBDE265_LIBRARY:FILEPATH=%thirdPartyPath%\libde265-%arch%\build\libde265\libde265.lib^ + -DLIBDE265_INCLUDE_DIR:PATH=%thirdPartyPath%\libde265-%arch%^ + -DLIBDE265_LIBRARY:FILEPATH=%thirdPartyPath%\libde265-%arch%\libde265\libde265.lib^ .. nmake \ No newline at end of file diff --git a/src/FileOnQ.Imaging.Heif/Build/libde265.targets b/src/FileOnQ.Imaging.Heif/Build/libde265.targets index 50d529f..665f164 100644 --- a/src/FileOnQ.Imaging.Heif/Build/libde265.targets +++ b/src/FileOnQ.Imaging.Heif/Build/libde265.targets @@ -15,8 +15,8 @@ - - + +