Loading

Paste #ptnzvsmcv

  1. diff --git a/config.lib b/config.lib
  2. --- a/config.lib
  3. +++ b/config.lib
  4. @@ -796,22 +796,22 @@ check_params() {
  5.                 log 1 "checking assert... disabled"
  6.         fi
  7.  
  8. -       pre_detect_with_zlib=$with_zlib
  9. -       detect_zlib
  10. -
  11. -       if [ "$with_zlib" = "0" ] || [ -z "$zlib-config" ]; then
  12. -               log 1 "WARNING: zlib was not detected or disabled"
  13. -               log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean that many features"
  14. -               log 1 "WARNING: (like loading most old savegames/scenarios, loading heightmaps,"
  15. -               log 1 "WARNING: using PNG, or using fonts, ...) will be disabled."
  16. -               if [ "$pre_detect_with_zlib" = "0" ]; then
  17. -                       log 1 "WARNING: We strongly suggest you to install zlib."
  18. -               else
  19. -                       log 1 "configure: error: no zlib detected"
  20. -                       log 1 " If you want to compile without zlib use --without-zlib as parameter"
  21. -                       exit
  22. -               fi
  23. -       fi
  24. +#      pre_detect_with_zlib=$with_zlib
  25. +#      detect_zlib
  26. +#
  27. +#      if [ "$with_zlib" = "0" ] || [ -z "$zlib-config" ]; then
  28. +#              log 1 "WARNING: zlib was not detected or disabled"
  29. +#              log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean that many features"
  30. +#              log 1 "WARNING: (like loading most old savegames/scenarios, loading heightmaps,"
  31. +#              log 1 "WARNING: using PNG, or using fonts, ...) will be disabled."
  32. +#              if [ "$pre_detect_with_zlib" = "0" ]; then
  33. +#                      log 1 "WARNING: We strongly suggest you to install zlib."
  34. +#              else
  35. +#                      log 1 "configure: error: no zlib detected"
  36. +#                      log 1 " If you want to compile without zlib use --without-zlib as parameter"
  37. +#                      exit
  38. +#              fi
  39. +#      fi
  40.  
  41.         pre_detect_with_lzma=$with_lzma
  42.         detect_lzma
  43. @@ -1667,12 +1667,13 @@ make_cflags_and_ldflags() {
  44.  
  45.         if [ "$with_zlib" != "0" ]; then
  46.                 CFLAGS="$CFLAGS -DWITH_ZLIB"
  47. -               CFLAGS="$CFLAGS `$zlib_config --cflags | tr '\n\r' '  '`"
  48. -               if [ "$enable_static" != "0" ]; then
  49. -                       LIBS="$LIBS `$zlib_config --libs --static | tr '\n\r' '  '`"
  50. -               else
  51. -                       LIBS="$LIBS `$zlib_config --libs | tr '\n\r' '  '`"
  52. -               fi
  53. +               CFLAGS="$CFLAGS -I/path/to/mingw/zlib/include/dir"
  54. +#              if [ "$enable_static" != "0" ]; then
  55. +#                      LIBS="$LIBS `$zlib_config --libs --static | tr '\n\r' '  '`"
  56. +#              else
  57. +#                      LIBS="$LIBS `$zlib_config --libs | tr '\n\r' '  '`"
  58. +#              fi
  59. +               LIBS="$LIBS -L/path/to/mingw/zlib/lib/dir -lz"  # includes /path/to/mingw/zlib/lib/dir/libz.<something>
  60.         fi
  61.  
  62.         if [ -n "$lzma_config" ]; then

Comments