X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=.gitlab-ci.yml;h=240f5c0a98438c75ec155a4c8ab13fa1e6073869;hp=6ff0aac717b51720d0cd4b20a3424917b912f320;hb=b9a46d8e2b7e7e22c706e7dd3734f31015db4408;hpb=b1dfd65940f6913ebe59d1da4de7a4a37103800b

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ff0aac..240f5c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,15 +6,18 @@ cache:
   - /var/cache/dnf
 
 before_script:
-  - dnf --quiet --assumeyes install /usr/bin/cmake "pkgconfig(libjpeg)" "pkgconfig(openal)" "pkgconfig(sdl)" "pkgconfig(glu)" "pkgconfig(libpng)" "pkgconfig(zlib)" "pkgconfig(vorbis)" "pkgconfig(vorbisfile)" "pkgconfig(ogg)" make
+  - dnf --quiet --assumeyes install /usr/bin/cmake "pkgconfig(libjpeg)" "pkgconfig(openal)" "pkgconfig(sdl2)" "pkgconfig(glu)" "pkgconfig(libpng)" "pkgconfig(zlib)" "pkgconfig(vorbis)" "pkgconfig(vorbisfile)" "pkgconfig(ogg)" make
 
 build_gcc:
   stage: build
   script:
     - dnf --quiet --assumeyes install gcc gcc-c++
-    - export CC=gcc; export CXX=g++; mkdir -p x86_64-linux-gnu-gcc gcc-build; cd x86_64-linux-gnu-gcc; cmake .. -DLUGARU_INSTALL_PREFIX=/builds/osslugaru/lugaru/gcc-build; make -j4; make install
+    - export CC=gcc; export CXX=g++
+    - mkdir -p x86_64-linux-gnu-gcc gcc-build; cd x86_64-linux-gnu-gcc
+    - cmake .. -DCMAKE_INSTALL_PREFIX=/builds/osslugaru/lugaru/gcc-build
+    - make -j4; make install
   artifacts:
-    expire_in: 7d
+    expire_in: 14d
     paths:
       - ./gcc-build
   tags:
@@ -24,9 +27,12 @@ build_clang:
   stage: build
   script:
     - dnf --quiet --assumeyes install clang
-    - export CC=clang; export CXX=clang++; mkdir -p x86_64-linux-gnu-clang clang-build; cd x86_64-linux-gnu-clang; cmake .. -DLUGARU_INSTALL_PREFIX=/builds/osslugaru/lugaru/clang-build; make -j4; make install
+    - export CC=clang; export CXX=clang++
+    - mkdir -p x86_64-linux-gnu-clang clang-build; cd x86_64-linux-gnu-clang
+    - cmake .. -DCMAKE_INSTALL_PREFIX=/builds/osslugaru/lugaru/clang-build
+    - make -j4; make install
   artifacts:
-    expire_in: 7d
+    expire_in: 14d
     paths:
       - ./clang-build
   tags:
@@ -35,11 +41,32 @@ build_clang:
 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
+    - dnf --quiet --assumeyes install mingw32-gcc mingw32-gcc-c++ mingw32-binutils mingw32-headers mingw32-libjpeg-turbo mingw32-libpng mingw32-SDL2 mingw32-zlib mingw32-libvorbis mingw32-libogg mingw32-openal-soft
+    - 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 -DCMAKE_INSTALL_PREFIX=/builds/osslugaru/lugaru/mingw32-build
+    - make -j4; make install
   artifacts:
-    expire_in: 7d
+    expire_in: 14d
     paths:
       - ./mingw32-build
   tags:
     - shared
+
+build_mingw64:
+  stage: build
+  script:
+    - dnf --quiet --assumeyes install mingw64-gcc mingw64-gcc-c++ mingw64-binutils mingw64-headers mingw64-libjpeg-turbo mingw64-libpng mingw64-SDL2 mingw64-zlib mingw64-libvorbis mingw64-libogg mingw64-openal-soft
+    - export PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig"
+    - export PATH=/usr/x86_64-w64-mingw32/bin:$PATH
+    - mkdir -p x86_64-w64-mingw32 mingw64-build; cd x86_64-w64-mingw32
+    - cmake .. -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw64.cmake -DCMAKE_INSTALL_PREFIX=/builds/osslugaru/lugaru/mingw64-build
+    - make -j4; make install
+  artifacts:
+    expire_in: 14d
+    paths:
+      - ./mingw64-build
+  tags:
+    - shared
+