Add missing force internal command for OSX and refactor CI file

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21d57bf85b232fe51755288913a98f077689657e..64df5ce04e2af2f42b60b26d1f409b83bd4012fe 100644 (file)
--- 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 ae480d161609fd960079b87e837b968093cc2245..a082391123dafb920fa7caa745e88181f6a6fcc9 100644 (file)
--- 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/")