Merge pull request #35680 from elpaso/mxe-protobuf

Fix MXE builds after protobuf
qgis · Apr 9, 2020 · d3c4e4d · d3c4e4d
2 parents fad2017 + 8513c8d
commit d3c4e4d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ms-windows/mxe/README.md b/ms-windows/mxe/README.md
@@ -44,7 +44,10 @@ make MXE_TARGETS=i686-w64-mingw32.shared.posix -j 16 \
     qtwinextras \
     libzip \
     gsl \
-    libspatialindex
+    libspatialindex \
+    exiv2 \
+    protobuf
+
 ```
 
 When done, you can check and edit the `build-mxe.sh` script and set the `MXE` path to your mxe installation directory, `MXE` can also be passed as an environment variable.

diff --git a/ms-windows/mxe/mxe.Dockerfile b/ms-windows/mxe/mxe.Dockerfile
@@ -20,7 +20,8 @@ RUN make MXE_TARGETS=x86_64-w64-mingw32.shared.posix -j 16 \
     libzip \
     gsl \
     libspatialindex \
-    exiv2
+    exiv2 \
+    protobuf
 
 RUN chmod -R a+rw /mxe/usr/x86_64-w64-mingw32.shared.posix