From 43a3cc5f29b143e94e00576a86e0df5d6b9e83b7 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Tue, 19 Aug 2025 12:04:24 +0300 Subject: [PATCH] zlib build fix --- build-ogre.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build-ogre.sh b/build-ogre.sh index d3380b7..51d8f79 100755 --- a/build-ogre.sh +++ b/build-ogre.sh @@ -206,10 +206,16 @@ while true; do done if [ x$CLEAN = xtrue ]; then + rm -Rf assimp/build assimp/build-static rm -Rf assimp/build assimp/build-static rm -Rf ogre/build ogre/build-static ogre-sdk ogre-sdk-static rm -Rf ogre-procedural/build ogre-procedural/build-static rm -Rf ogre-projects/world2/build ogre-projects/world2/build-static + for d in zlib libjpeg-turbo libpng pugixml ffmpeg assimp \ + SDL SPIRV-Headers SPIRV-Tools glslang SPIRV-Cross \ + ogre ogre-procedural ogre-pagedgeometry ogrewater; do + rm -Rf $d/build $d/build-static + done fi CPU=$(uname -m) @@ -225,7 +231,8 @@ if [ ! -e blender-bin/bin/blender ]; then fi build_cmake_stuff debug release zlib "-DZLIB_BUILD_STATIC=OFF -DZLIB_BUILD_SHARED=ON -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_BUILD_SHARED=ON -DMINIZIP_BUILD_STATIC=OFF -DMINIZIP_ENABLE_BZIP2=OFF" -build_cmake_stuff debug release static zlib "-DZLIB_BUILD_STATIC=ON -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_BUILD_SHARED=OFF -DMINIZIP_BUILD_STATIC=ON -DMINIZIP_ENABLE_BZIP2=OFF" +build_cmake_stuff debug release clean static zlib "-DZLIB_BUILD_STATIC=ON -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_MINIZIP=OFF -DMINIZIP_BUILD_SHARED=OFF -DMINIZIP_BUILD_STATIC=ON -DMINIZIP_ENABLE_BZIP2=OFF" +build_cmake_stuff debug release clean static zlib "-DZLIB_BUILD_STATIC=ON -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_BUILD_SHARED=OFF -DMINIZIP_BUILD_STATIC=ON -DMINIZIP_ENABLE_BZIP2=OFF" build_cmake_stuff release debug libjpeg-turbo "" build_cmake_stuff release debug static libjpeg-turbo ""