diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index 95144bade..2be8baee6 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -12,6 +12,7 @@ cmake .. ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DWITH_INTERCONNECT=OFF ^ -DUTILITY_USE_ANSI_COLORS=ON ^ + -DBUILD_STATIC=%BUILD_STATIC% ^ -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b @@ -46,6 +47,7 @@ cmake .. ^ -DWITH_AL_INFO=ON ^ -DBUILD_TESTS=ON ^ -DBUILD_GL_TESTS=ON ^ + -DBUILD_STATIC=%BUILD_STATIC% ^ -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml index 3eb749178..10e382f81 100644 --- a/package/ci/appveyor.yml +++ b/package/ci/appveyor.yml @@ -18,6 +18,11 @@ environment: COMPILER: msvc APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_JOB_NAME: windows-vulkan-msvc2019 + - TARGET: desktop + COMPILER: msvc + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + APPVEYOR_JOB_NAME: windows-static-msvc2019 + BUILD_STATIC: ON - TARGET: desktop COMPILER: mingw APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 @@ -59,6 +64,8 @@ install: - set PATH=C:/tools/ninja;%PATH% - IF "%TARGET%" == "desktop" IF "%COMPILER%" == "mingw" pip install codecov +- IF NOT "%BUILD_STATIC%" == "ON" set BUILD_STATIC=OFF + # OpenAL - IF NOT "%TARGET%" == "rt" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\openal-soft-1.17.2-bin.zip appveyor DownloadFile http://kcat.strangesoft.net/openal-binaries/openal-soft-1.17.2-bin.zip - IF NOT "%TARGET%" == "rt" 7z x openal-soft-1.17.2-bin.zip && ren openal-soft-1.17.2-bin openal && echo [General] > %APPDATA%/alsoft.ini & echo drivers=null >> %APPDATA%/alsoft.ini diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh index e0e515ebf..55e7dade9 100755 --- a/package/ci/travis-desktop.sh +++ b/package/ci/travis-desktop.sh @@ -11,6 +11,7 @@ cmake .. \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_BUILD_TYPE=Debug \ -DBUILD_DEPRECATED=$BUILD_DEPRECATED \ + -DBUILD_STATIC=$BUILD_STATIC \ -DWITH_INTERCONNECT=OFF \ -G Ninja ninja install @@ -47,6 +48,7 @@ cmake .. \ -DBUILD_TESTS=ON \ -DBUILD_GL_TESTS=ON \ -DBUILD_DEPRECATED=$BUILD_DEPRECATED \ + -DBUILD_STATIC=$BUILD_STATIC \ -G Ninja # Otherwise the job gets killed (probably because using too much memory) ninja -j4 diff --git a/package/ci/travis.yml b/package/ci/travis.yml index d2f611b6c..9efde6577 100644 --- a/package/ci/travis.yml +++ b/package/ci/travis.yml @@ -62,6 +62,16 @@ matrix: - lcov - libsdl2-dev - libglfw3-dev + - language: cpp + os: linux + dist: xenial + compiler: gcc + env: + - JOBID=linux-static + - TARGET=desktop + - CMAKE_CXX_FLAGS="--coverage" + - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8" + - BUILD_STATIC=ON - language: cpp os: linux dist: xenial @@ -99,6 +109,16 @@ matrix: - JOBID=macos-gl - TARGET=desktop - CMAKE_CXX_FLAGS="--coverage" + - language: cpp + os: osx + # See above + osx_image: xcode9.3 + compiler: clang + env: + - JOBID=macos-static + - TARGET=desktop + - CMAKE_CXX_FLAGS="--coverage" + - BUILD_STATIC=ON - language: cpp os: osx osx_image: xcode7.3 @@ -188,6 +208,7 @@ install: - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! "$TARGET" == "desktop-sanitizers" ] && [ ! "$TARGET" == "android" ] && [ ! "$TARGET" == "desktop-vulkan" ]; then export CXX=g++-4.8; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-sanitizers" ]; then export CXX=clang++-3.8; fi - if [ "$BUILD_DEPRECATED" != "OFF" ]; then export BUILD_DEPRECATED=ON; fi +- if [ "$BUILD_STATIC" != "ON" ]; then export BUILD_STATIC=OFF; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-sanitizers" ] ); then export PLATFORM_GL_API=GLX; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-gles" ]; then export PLATFORM_GL_API=EGL; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "android" ]; then wget -nc https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip && unzip -q android-*.zip; fi