From 8f372db25c010303cc25868b48cb5c0d0a540067 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 20 May 2017 19:05:09 -0400 Subject: [PATCH] Remove zlib from documentation and CI setup --- .gitlab-ci.yml | 6 +++--- COMPILING.md | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a65f348..78b2dfe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ variables: EXTRA_REPO_INST_COMMAND: /bin/true JPEG_PACKAGE: "pkgconfig(libjpeg)" CMAKE_PACKAGE: "/usr/bin/cmake" - DEPENDENCY_PACKAGES: "pkgconfig(openal) pkgconfig(sdl2) pkgconfig(glu) pkgconfig(libpng) pkgconfig(zlib) pkgconfig(vorbis) pkgconfig(vorbisfile) pkgconfig(ogg)" + DEPENDENCY_PACKAGES: "pkgconfig(openal) pkgconfig(sdl2) pkgconfig(glu) pkgconfig(libpng) pkgconfig(vorbis) pkgconfig(vorbisfile) pkgconfig(ogg)" COMMON_PACKAGES: "$COMPILER_PACKAGES $CMAKE_PACKAGE make $DEPENDENCY_PACKAGES $JPEG_PACKAGE" before_script: @@ -74,7 +74,7 @@ build_mingw32: stage: build variables: COMPILER_PACKAGES: "mingw32-gcc mingw32-gcc-c++ mingw32-binutils mingw32-headers" - DEPENDENCY_PACKAGES: "mingw32-libjpeg-turbo mingw32-libpng mingw32-SDL2 mingw32-zlib mingw32-libvorbis mingw32-libogg mingw32-openal-soft" + DEPENDENCY_PACKAGES: "mingw32-libjpeg-turbo mingw32-libpng mingw32-SDL2 mingw32-libvorbis mingw32-libogg mingw32-openal-soft" script: - 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 @@ -92,7 +92,7 @@ build_mingw64: stage: build variables: COMPILER_PACKAGES: "mingw64-gcc mingw64-gcc-c++ mingw64-binutils mingw64-headers" - DEPENDENCY_PACKAGES: "mingw64-libjpeg-turbo mingw64-libpng mingw64-SDL2 mingw64-zlib mingw64-libvorbis mingw64-libogg mingw64-openal-soft" + DEPENDENCY_PACKAGES: "mingw64-libjpeg-turbo mingw64-libpng mingw64-SDL2 mingw64-libvorbis mingw64-libogg mingw64-openal-soft" script: - export PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" - export PATH=/usr/x86_64-w64-mingw32/bin:$PATH diff --git a/COMPILING.md b/COMPILING.md index fe67087..da7f733 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -16,7 +16,6 @@ available via your package manager (dnf, urpmi, apt, brew, etc.): - LibPNG - OpenAL Soft - Ogg, Vorbis and Vorbisfile -- Zlib ## GNU/Linux -- 2.39.2