From d792040d51f879e5f89e428675e7bb8abb1b815c Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 13 Nov 2016 16:36:42 -0500 Subject: [PATCH] Add missing force internal command for OSX and refactor CI file --- .gitlab-ci.yml | 12 +++++++++--- CMakeLists.txt | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21d57bf..64df5ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,10 @@ 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 .. -DLUGARU_INSTALL_PREFIX=/builds/osslugaru/lugaru/gcc-build + - make -j4; make install artifacts: expire_in: 7d paths: @@ -24,7 +27,10 @@ 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 .. -DLUGARU_INSTALL_PREFIX=/builds/osslugaru/lugaru/clang-build + - make -j4; make install artifacts: expire_in: 7d paths: @@ -39,7 +45,7 @@ build_mingw32: - 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 + - 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 -DLUGARU_FORCE_INTERNAL_OPENAL=True - make -j4; make install artifacts: expire_in: 7d diff --git a/CMakeLists.txt b/CMakeLists.txt index ae480d1..a082391 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,7 @@ if(APPLE) set(LUGARU_FORCE_INTERNAL_PNG True) set(LUGARU_FORCE_INTERNAL_VORBIS True) set(LUGARU_FORCE_INTERNAL_ZLIB True) + set(LUGARU_FORCE_INTERNAL_OPENAL True) endif(APPLE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") -- 2.39.5