From da66998e8b186da729b502f118245bae3c342b70 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrewh@fileonq.com>
Date: Tue, 1 Feb 2022 11:22:00 -0500
Subject: [PATCH] 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 @@
 		<Exec Command="libde265.bat x86 $(Configuration)" WorkingDirectory="$(ThirdPartyDir)/../build" />
 		<Exec Command="libde265.bat x64 $(Configuration)" WorkingDirectory="$(ThirdPartyDir)/../build" />
 
-		<Copy SourceFiles="$(ThirdPartyDir)/libde265-x86/build/libde265/libde265.dll" DestinationFolder="runtimes/win-x86/native" />
-		<Copy SourceFiles="$(ThirdPartyDir)/libde265-x64/build/libde265/libde265.dll" DestinationFolder="runtimes/win-x64/native" />
+		<Copy SourceFiles="$(ThirdPartyDir)/libde265-x86/libde265/libde265.dll" DestinationFolder="runtimes/win-x86/native" />
+		<Copy SourceFiles="$(ThirdPartyDir)/libde265-x64/libde265/libde265.dll" DestinationFolder="runtimes/win-x64/native" />
 	</Target>
 
 	<Target Name="libde265-clean" BeforeTargets="Clean">