diff options
| author | truebrain <truebrain@openttd.org> | 2008-10-19 20:53:13 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2008-10-19 20:53:13 +0000 |
| commit | 692823be459a3a9b3610f61f1bdeb8d801cc9eb5 (patch) | |
| tree | 88b4ee9745c30347784aaebe93ad4f2e258a0e60 | |
| parent | 321e40115ddc4fe30785ad0e7fd84c5caf0dda2e (diff) | |
| download | openttd-692823be459a3a9b3610f61f1bdeb8d801cc9eb5.tar.xz | |
(svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
| -rw-r--r-- | config.lib | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/config.lib b/config.lib index 637d20b59..ce834ed3e 100644 --- a/config.lib +++ b/config.lib @@ -563,7 +563,7 @@ check_params() { detect_cocoa if [ "$enable_dedicated" != "0" ]; then - log 1 "checking GDI video driver... skipping" + log 1 "checking GDI video driver... dedicated server, skipping" log 1 "checking dedicated... found" if [ "$enable_network" = "0" ]; then @@ -1750,7 +1750,7 @@ detect_sdl() { fi if [ "$enable_dedicated" != "0" ]; then - log 1 "checking SDL... skipping" + log 1 "checking SDL... dedicated server, skipping" sdl_config="" return 0 @@ -1808,7 +1808,7 @@ detect_cocoa() { fi if [ "$enable_dedicated" != "0" ]; then - log 1 "checking COCOA... skipping" + log 1 "checking COCOA... dedicated server, skipping" with_cocoa="0" return 0 @@ -1993,6 +1993,12 @@ detect_freetype() { freetype_config="" return 0 fi + if [ "$with_freetype" = "1" ] && [ "$enable_dedicated" != "0" ]; then + log 1 "checking libfreetype... dedicated server, skipping" + + freetype_config="" + return 0 + fi if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]; then log 1 "configure: error: libfreetype depends on zlib, which couldn't be found / was disabled" @@ -2037,6 +2043,12 @@ detect_fontconfig() { fontconfig_config="" return 0 fi + if [ "$with_fontconfig" = "1" ] && [ "$enable_dedicated" != "0" ]; then + log 1 "checking libfontconfig... dedicated server, skipping" + + fontconfig_config="" + return 0 + fi if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then log 1 "checking libfontconfig... WIN32, skipping" @@ -2086,6 +2098,12 @@ detect_icu() { icu_config="" return 0 fi + if [ "$with_icu" = "1" ] && [ "$enable_dedicated" != "0" ]; then + log 1 "checking libicu... dedicated server, skipping" + + icu_config="" + return 0 + fi if [ "$with_icu" = "1" ] || [ "$with_icu" = "" ] || [ "$with_icu" = "2" ]; then icu_config="icu-config" |