zlib build fix
This commit is contained in:
@@ -206,10 +206,16 @@ while true; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
if [ x$CLEAN = xtrue ]; then
|
if [ x$CLEAN = xtrue ]; then
|
||||||
|
rm -Rf assimp/build assimp/build-static
|
||||||
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/build ogre/build-static ogre-sdk ogre-sdk-static
|
||||||
rm -Rf ogre-procedural/build ogre-procedural/build-static
|
rm -Rf ogre-procedural/build ogre-procedural/build-static
|
||||||
rm -Rf ogre-projects/world2/build ogre-projects/world2/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
|
fi
|
||||||
|
|
||||||
CPU=$(uname -m)
|
CPU=$(uname -m)
|
||||||
@@ -225,7 +231,8 @@ if [ ! -e blender-bin/bin/blender ]; then
|
|||||||
fi
|
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 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 libjpeg-turbo ""
|
||||||
build_cmake_stuff release debug static libjpeg-turbo ""
|
build_cmake_stuff release debug static libjpeg-turbo ""
|
||||||
|
|||||||
Reference in New Issue
Block a user