diff --git a/Jenkinsfile b/Jenkinsfile index ae9bbbc..853d3c0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { // Multi-branch pipeline script for Yerbacon. cmakeBuild buildDir: 'cmake-build-release-arm', buildType: 'release', cleanBuild: true, installation: 'Main', cmakeArgs: '-DCMAKE_C_COMPILER=/usr/bin/arm-linux-gnueabi-gcc -DCMAKE_CXX_COMPILER=/usr/bin/arm-linux-gnueabi-g++ -DCMAKE_LINKER=/usr/bin/arm-linux-gnueabi-ld.gold -DCMAKE_AR=/usr/bin/arm-linux-gnueabi-ar -DCPACK_RPM_PACKAGE_ARCHITECTURE=armv4l -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=armel' cmakeBuild buildDir: 'cmake-build-release-win32', buildType: 'release', cleanBuild: true, installation: 'Main', - cmakeArgs: '-DCMAKE_C_COMPILER=/usr/bin/i686-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=/usr/bin/i686-w64-mingw32-c++ -DCMAKE_SYSTEM_PROCESSOR=i686' + cmakeArgs: '-DCMAKE_C_COMPILER=/usr/bin/i686-w64-mingw32-gcc-posix -DCMAKE_CXX_COMPILER=/usr/bin/i686-w64-mingw32-c++-posix -DCMAKE_SYSTEM_PROCESSOR=i686' cmake arguments: '--build ./cmake-build-release --target ybcon -- -j 9', installation: 'Main' cmake arguments: '--build ./cmake-build-release-win32 --target ybcon -- -j 9', installation: 'Main' sh 'strip ./cmake-build-*/ybcon' diff --git a/README.md b/README.md index 27a3c82..23af668 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ CMake 3.18 or higher is needed. ### Windows target - - MinGW32 - - The required packages for threading support (`gcc-mingw-w64-i686-posix-runtime` on debian) + - MinGW32 (on debian you will need to use the `i686-w64-mingw32-gcc-posix` executable provided by the `gcc-mingw-w64-i686-posix-runtime` package) MSVC could also be used instead if you are on Windows. \ No newline at end of file