Fix cross-compiling command and add CI clause for MinGW

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dde4c21d4c333fa6c490538923c66804da9d0e07..6ff0aac717b51720d0cd4b20a3424917b912f320 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,3 +31,15 @@ build_clang:
       - ./clang-build
   tags:
     - shared
+
+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
+  artifacts:
+    expire_in: 7d
+    paths:
+      - ./mingw32-build
+  tags:
+    - shared

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96d95b65ae8764c3f986ee19be4e57fb6684773c..ae480d161609fd960079b87e837b968093cc2245 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,7 +138,7 @@ endif(MSVC)
 if(WIN32)
   if(CMAKE_CROSSCOMPILING)
     ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-                                                 COMMAND i686-pc-mingw32-windres
+                                                 COMMAND i686-w64-mingw32-windres
                                                          -I${SRCDIR}/win-res
                                                          -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
                                                          -i${SRCDIR}/win-res/Lugaru.rc