Skip to content

Commit

Permalink
Merge pull request #649 from evo-lua/zlib-build-flags
Browse files Browse the repository at this point in the history
Disable some unnecessary zlib build options
  • Loading branch information
rdw-software authored Jan 17, 2025
2 parents dd5296a + 0c2ee9e commit 3f0542e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion deps/zlib-unixbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ OUT_DIR=ninjabuild-unix
SRC_DIR=deps/madler/zlib
BUILD_DIR=$SRC_DIR/cmakebuild-unix

cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_C_COMPILER=gcc
ZLIB_BUILD_FLAGS="-DZLIB_BUILD_EXAMPLES=OFF -DSKIP_INSTALL_ALL=ON"
cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_C_COMPILER=gcc $ZLIB_BUILD_FLAGS
cmake --build $BUILD_DIR --clean-first

cp $BUILD_DIR/libz.a $OUT_DIR/zlibstatic.a
Expand Down
3 changes: 2 additions & 1 deletion deps/zlib-windowsbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ OUT_DIR=ninjabuild-windows
SRC_DIR=deps/madler/zlib
BUILD_DIR=$SRC_DIR/cmakebuild-windows

cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_C_COMPILER=gcc
ZLIB_BUILD_FLAGS="-DZLIB_BUILD_EXAMPLES=OFF -DSKIP_INSTALL_ALL=ON"
cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_C_COMPILER=gcc $ZLIB_BUILD_FLAGS
cmake --build $BUILD_DIR --clean-first

cp $BUILD_DIR/libzlibstatic.a $OUT_DIR/zlibstatic.a
Expand Down

0 comments on commit 3f0542e

Please sign in to comment.