Fix relative include paths in public/cpp

bblanchon · Oct 11, 2017 · 58ea7fe · 58ea7fe
1 parent d8250d0
commit 58ea7fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/build.bat b/build.bat
@@ -10,7 +10,7 @@ set DepotTools_DIR=%CD%/depot_tools
 set PDFium_URL=https://pdfium.googlesource.com/pdfium.git
 set PDFium_SOURCE_DIR=%CD%\pdfium
 set PDFium_BUILD_DIR=%PDFium_SOURCE_DIR%\out
-set PDFium_PATCH=%CD%\patches\shared_library.patch
+set PDFium_PATCH_DIR=%CD%\patches
 set PDFium_CMAKE_CONFIG=%CD%\PDFiumConfig.cmake
 set PDFium_ARGS=%CD%\args\windows.args.gn
 
@@ -49,7 +49,8 @@ call gclient sync
 : Patch
 echo on
 cd %PDFium_SOURCE_DIR%
-call git apply -v %PDFium_PATCH%
+call git apply -v "%PDFium_PATCH_DIR%\shared_library.patch"
+call git apply -v "%PDFium_PATCH_DIR%\relative_includes.patch"
 
 : Configure
 if "%CONFIGURATION%"=="Release" echo is_debug=false >> %PDFium_ARGS%

diff --git a/build.sh b/build.sh
@@ -54,6 +54,7 @@ gclient sync
 # Patch
 cd "$PDFium_SOURCE_DIR"
 git apply -v "$PDFium_PATCH_DIR/shared_library.patch"
+git apply -v "$PDFium_PATCH_DIR/relative_includes.patch"
 cd "$PDFium_SOURCE_DIR/build"
 git apply -v "$PDFium_PATCH_DIR/static_libstdcxx.patch"
 

diff --git a/patches/relative-includes.patch → patches/relative_includes.patch b/patches/relative-includes.patch → patches/relative_includes.patch