dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r14689) -Change: make configure die on commonly made user mistakes, like not having SDL development files or zlib headers installed; you can still compile a dedicated server or a binary without zlib, but you have to explicitly force it.

Browse Source
This commit is contained in:
rubidium
2008-12-18 12:23:08 +00:00
parent ade1802e04
commit 7f4683a811
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config.lib
View File

@@ -574,8 +574,8 @@ check_params() {
log 1 "checking dedicated... found" log 1 "checking dedicated... found"
if [ "$enable_network" = "0" ]; then if [ "$enable_network" = "0" ]; then
log 1 "WARNING: compiling a dedicated server without network is pointless" log 1 "configure: error: building a dedicated server without network support is pointless"
sleep 5 exit 1
fi fi
else else
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
@@ -585,11 +585,9 @@ check_params() {
fi fi
if [ -z "$allegro_config" ] && [ -z "$sdl_config" ] && [ "$with_cocoa" = 0 ] && [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then if [ -z "$allegro_config" ] && [ -z "$sdl_config" ] && [ "$with_cocoa" = 0 ] && [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
log 1 "WARNING: no video driver found, building dedicated only" log 1 "configure: error: no video driver development files found"
enable_dedicated="1" log 1 " If you want a dedicated server use --enable-dedicated as parameter"
sleep 1 exit 1
log 1 "checking dedicated... found"
else else
log 1 "checking dedicated... not selected" log 1 "checking dedicated... not selected"
fi fi
@@ -619,6 +617,7 @@ check_params() {
log 1 "checking assert... disabled" log 1 "checking assert... disabled"
fi fi
pre_detect_with_zlib=$with_zlib
detect_zlib detect_zlib
if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
@@ -626,8 +625,13 @@ check_params() {
log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean many features (like" log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean many features (like"
log 1 "WARNING: loading most savegames/scenarios, joining most servers, loading" log 1 "WARNING: loading most savegames/scenarios, joining most servers, loading"
log 1 "WARNING: heightmaps, using PNG or using fonts, ...) will be disabled." log 1 "WARNING: heightmaps, using PNG or using fonts, ...) will be disabled."
log 1 "WARNING: We strongly suggest you to install zlib." if [ "$pre_detect_with_zlib" = "0" ]; then
sleep 5 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 fi
detect_png detect_png