mirror of
https://github.com/OpenTTD/OpenTTD
synced 2026-02-02 09:04:29 +01:00
(svn r20261) [1.0] -Backport from trunk:
- Fix: Make it possible to properly assess the length of the rail toolbar caption, don't require '{WHITE}' control codes (r20242)
- Fix: Check for disallowed level crossings also when converting rail (r20237)
- Fix: Haiku uses a 'special' location for headers (r20219)
- Fix: Desync due to (temporary) wrong railtype; when loading a savegame the railtype of some (high ID) trains could be wrong [FS#3945] (r20137)
This commit is contained in:
@@ -2311,6 +2311,13 @@ detect_library() {
|
||||
log 2 " trying /usr/pkg/include/$4$5... no"
|
||||
fi
|
||||
fi
|
||||
if [ -z "$res" ] && [ "$os" = "HAIKU" ]; then
|
||||
eval "$2=`ls -1 /boot/common/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
|
||||
eval "res=\$$2"
|
||||
if [ -z "$res" ]; then
|
||||
log 2 " trying /boot/common/include/$4$5... no"
|
||||
fi
|
||||
fi
|
||||
|
||||
eval "res=\$$2"
|
||||
if [ -n "$res" ] && ( [ -n "$force_static" ] || ( [ "$enable_static" != "0" ] && [ "$os" != "OSX" ] ) ); then
|
||||
|
||||
Reference in New Issue
Block a user