From: Neal Gompa <ngompa13@gmail.com>
Date: Sun, 13 Nov 2016 21:30:55 +0000 (-0500)
Subject: CI: Fixup for MinGW builds
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=30a0d3cb0ed4c918e7fcc8bf2026c61ed3e51797;p=lugaru.git

CI: Fixup for MinGW builds
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ff0aac..21d57bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,11 @@ build_mingw32:
   stage: build
   script:
     - dnf --quiet --assumeyes install mingw32-gcc mingw32-gcc-c++ mingw32-binutils
-    - export PATH=/usr/i686-w64-mingw32/bin:$PATH; mkdir -p i686-w64-mingw32 mingw32-build; cd i686-w64-mingw32; cmake .. -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32.cmake -DLUGARU_INSTALL_PREFIX=/builds/osslugaru/lugaru/mingw32-build; make -j4; make install
+    - export PKG_CONFIG_LIBDIR="/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig"
+    - export PATH=/usr/i686-w64-mingw32/bin:$PATH
+    - mkdir -p i686-w64-mingw32 mingw32-build; cd i686-w64-mingw32
+    - cmake .. -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32.cmake -DLUGARU_INSTALL_PREFIX=/builds/osslugaru/lugaru/mingw32-build -DLUGARU_FORCE_INTERNAL_SDL=True -DLUGARU_FORCE_INTERNAL_GLU=True -DLUGARU_FORCE_INTERNAL_JPEG=True -DLUGARU_FORCE_INTERNAL_PNG=True -DLUGARU_FORCE_INTERNAL_VORBIS=True -DLUGARU_FORCE_INTERNAL_ZLIB=True
+    - make -j4; make install
   artifacts:
     expire_in: 7d
     paths: