gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-02 20:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested

Browse Source
This commit is contained in:
truebrain 2008-10-19 20:53:13 +00:00
parent 8cce756f8f
commit f609a26929
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config.lib
View File

@ -563,7 +563,7 @@ check_params() {
detect_cocoa detect_cocoa
if [ "$enable_dedicated" != "0" ]; then 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" log 1 "checking dedicated... found"
if [ "$enable_network" = "0" ]; then if [ "$enable_network" = "0" ]; then
@ -1750,7 +1750,7 @@ detect_sdl() {
fi fi
if [ "$enable_dedicated" != "0" ]; then if [ "$enable_dedicated" != "0" ]; then
log 1 "checking SDL... skipping" log 1 "checking SDL... dedicated server, skipping"
sdl_config="" sdl_config=""
return 0 return 0
@ -1808,7 +1808,7 @@ detect_cocoa() {
fi fi
if [ "$enable_dedicated" != "0" ]; then if [ "$enable_dedicated" != "0" ]; then
log 1 "checking COCOA... skipping" log 1 "checking COCOA... dedicated server, skipping"
with_cocoa="0" with_cocoa="0"
return 0 return 0
@ -1993,6 +1993,12 @@ detect_freetype() {
freetype_config="" freetype_config=""
return 0 return 0
fi 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 if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]; then
log 1 "configure: error: libfreetype depends on zlib, which couldn't be found / was disabled" log 1 "configure: error: libfreetype depends on zlib, which couldn't be found / was disabled"
@ -2037,6 +2043,12 @@ detect_fontconfig() {
fontconfig_config="" fontconfig_config=""
return 0 return 0
fi 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 if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
log 1 "checking libfontconfig... WIN32, skipping" log 1 "checking libfontconfig... WIN32, skipping"
@ -2086,6 +2098,12 @@ detect_icu() {
icu_config="" icu_config=""
return 0 return 0
fi 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 if [ "$with_icu" = "1" ] || [ "$with_icu" = "" ] || [ "$with_icu" = "2" ]; then
icu_config="icu-config" icu_config="icu-config"