mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-10-31 15:20:10 +00:00
(svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
This commit is contained in:
parent
8cce756f8f
commit
f609a26929
24
config.lib
24
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"
|
||||
|
Loading…
Reference in New Issue
Block a user