diff --git a/config.lib b/config.lib --- a/config.lib +++ b/config.lib @@ -796,22 +796,22 @@ check_params() { log 1 "checking assert... disabled" fi - pre_detect_with_zlib=$with_zlib - detect_zlib - - if [ "$with_zlib" = "0" ] || [ -z "$zlib-config" ]; then - log 1 "WARNING: zlib was not detected or disabled" - log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean that many features" - log 1 "WARNING: (like loading most old savegames/scenarios, loading heightmaps," - log 1 "WARNING: using PNG, or using fonts, ...) will be disabled." - if [ "$pre_detect_with_zlib" = "0" ]; then - log 1 "WARNING: We strongly suggest you to install zlib." - else - log 1 "configure: error: no zlib detected" - log 1 " If you want to compile without zlib use --without-zlib as parameter" - exit - fi - fi +# pre_detect_with_zlib=$with_zlib +# detect_zlib +# +# if [ "$with_zlib" = "0" ] || [ -z "$zlib-config" ]; then +# log 1 "WARNING: zlib was not detected or disabled" +# log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean that many features" +# log 1 "WARNING: (like loading most old savegames/scenarios, loading heightmaps," +# log 1 "WARNING: using PNG, or using fonts, ...) will be disabled." +# if [ "$pre_detect_with_zlib" = "0" ]; then +# log 1 "WARNING: We strongly suggest you to install zlib." +# else +# log 1 "configure: error: no zlib detected" +# log 1 " If you want to compile without zlib use --without-zlib as parameter" +# exit +# fi +# fi pre_detect_with_lzma=$with_lzma detect_lzma @@ -1667,12 +1667,13 @@ make_cflags_and_ldflags() { if [ "$with_zlib" != "0" ]; then CFLAGS="$CFLAGS -DWITH_ZLIB" - CFLAGS="$CFLAGS `$zlib_config --cflags | tr '\n\r' ' '`" - if [ "$enable_static" != "0" ]; then - LIBS="$LIBS `$zlib_config --libs --static | tr '\n\r' ' '`" - else - LIBS="$LIBS `$zlib_config --libs | tr '\n\r' ' '`" - fi + CFLAGS="$CFLAGS -I/path/to/mingw/zlib/include/dir" +# if [ "$enable_static" != "0" ]; then +# LIBS="$LIBS `$zlib_config --libs --static | tr '\n\r' ' '`" +# else +# LIBS="$LIBS `$zlib_config --libs | tr '\n\r' ' '`" +# fi + LIBS="$LIBS -L/path/to/mingw/zlib/lib/dir -lz" # includes /path/to/mingw/zlib/lib/dir/libz. fi if [ -n "$lzma_config" ]; then