summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md5
-rw-r--r--config.lib22
-rwxr-xr-xconfigure3
-rwxr-xr-xprojects/generate2
-rw-r--r--source.list2
-rw-r--r--src/intro_gui.cpp2
-rw-r--r--src/lang/afrikaans.txt1
-rw-r--r--src/lang/arabic_egypt.txt1
-rw-r--r--src/lang/basque.txt1
-rw-r--r--src/lang/belarusian.txt1
-rw-r--r--src/lang/brazilian_portuguese.txt1
-rw-r--r--src/lang/bulgarian.txt1
-rw-r--r--src/lang/catalan.txt1
-rw-r--r--src/lang/croatian.txt1
-rw-r--r--src/lang/czech.txt1
-rw-r--r--src/lang/danish.txt1
-rw-r--r--src/lang/dutch.txt1
-rw-r--r--src/lang/english.txt1
-rw-r--r--src/lang/english_AU.txt1
-rw-r--r--src/lang/english_US.txt1
-rw-r--r--src/lang/esperanto.txt1
-rw-r--r--src/lang/estonian.txt1
-rw-r--r--src/lang/faroese.txt1
-rw-r--r--src/lang/finnish.txt1
-rw-r--r--src/lang/french.txt1
-rw-r--r--src/lang/gaelic.txt1
-rw-r--r--src/lang/galician.txt1
-rw-r--r--src/lang/german.txt1
-rw-r--r--src/lang/greek.txt1
-rw-r--r--src/lang/hebrew.txt1
-rw-r--r--src/lang/hungarian.txt1
-rw-r--r--src/lang/icelandic.txt1
-rw-r--r--src/lang/indonesian.txt1
-rw-r--r--src/lang/irish.txt1
-rw-r--r--src/lang/italian.txt1
-rw-r--r--src/lang/japanese.txt1
-rw-r--r--src/lang/korean.txt1
-rw-r--r--src/lang/latin.txt1
-rw-r--r--src/lang/latvian.txt1
-rw-r--r--src/lang/lithuanian.txt1
-rw-r--r--src/lang/luxembourgish.txt1
-rw-r--r--src/lang/malay.txt1
-rw-r--r--src/lang/norwegian_bokmal.txt1
-rw-r--r--src/lang/norwegian_nynorsk.txt1
-rw-r--r--src/lang/polish.txt1
-rw-r--r--src/lang/portuguese.txt1
-rw-r--r--src/lang/romanian.txt1
-rw-r--r--src/lang/russian.txt1
-rw-r--r--src/lang/serbian.txt1
-rw-r--r--src/lang/simplified_chinese.txt1
-rw-r--r--src/lang/slovak.txt1
-rw-r--r--src/lang/slovenian.txt1
-rw-r--r--src/lang/spanish.txt1
-rw-r--r--src/lang/spanish_MX.txt1
-rw-r--r--src/lang/swedish.txt1
-rw-r--r--src/lang/tamil.txt1
-rw-r--r--src/lang/thai.txt1
-rw-r--r--src/lang/traditional_chinese.txt1
-rw-r--r--src/lang/turkish.txt1
-rw-r--r--src/lang/ukrainian.txt1
-rw-r--r--src/lang/unfinished/chuvash.txt1
-rw-r--r--src/lang/unfinished/frisian.txt1
-rw-r--r--src/lang/unfinished/macedonian.txt1
-rw-r--r--src/lang/unfinished/persian.txt1
-rw-r--r--src/lang/unfinished/urdu.txt1
-rw-r--r--src/lang/vietnamese.txt1
-rw-r--r--src/lang/welsh.txt1
-rw-r--r--src/network/core/host.cpp2
-rw-r--r--src/network/core/os_abstraction.h58
-rw-r--r--src/network/core/udp.cpp2
-rw-r--r--src/os/unix/unix.cpp6
-rw-r--r--src/stdafx.h6
-rw-r--r--src/video/dedicated_v.cpp4
-rw-r--r--src/video/sdl_v.cpp2
74 files changed, 32 insertions, 145 deletions
diff --git a/README.md b/README.md
index bf90f5142..f69566fdf 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,6 @@ OpenTTD has been ported to several platforms and operating systems. It should
not be very difficult to port it to a new platform. The currently working
platforms are:
-- BeOS (SDL or Allegro)
- DOS (Allegro)
- FreeBSD (SDL)
- Linux (SDL or Allegro)
@@ -546,10 +545,6 @@ However, for the first build one has to do a '`./configure`' first.
To make a universal binary type '`./configure --enabled-universal`'
instead of '`./configure`'.
-### BeOS:
-
-Use '`make`', but do a '`./configure`' before the first build.
-
### OS/2:
A comprehensive GNU build environment is required to build the OS/2 version.
diff --git a/config.lib b/config.lib
index 31476cd80..6013ab34b 100644
--- a/config.lib
+++ b/config.lib
@@ -559,10 +559,10 @@ check_params() {
# Check if all params have valid values
- # OS only allows DETECT, UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS
- if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS)$'`" ]; then
+ # OS only allows DETECT, UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS
+ if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS)$'`" ]; then
log 1 "configure: error: invalid option --os=$os"
- log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS]"
+ log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS]"
exit 1
fi
# cpu_type can be either 32 or 64
@@ -1641,12 +1641,12 @@ make_cflags_and_ldflags() {
fi
fi
- if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ]; then
+ if [ "$os" = "HAIKU" ]; then
LIBS="$LIBS -lmidi -lbe"
fi
# Most targets act like UNIX, just with some additions
- if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ] || [ "$os" = "OSX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
+ if [ "$os" = "HAIKU" ] || [ "$os" = "OSX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
CFLAGS="$CFLAGS -DUNIX"
fi
# And others like Windows
@@ -1861,10 +1861,6 @@ make_cflags_and_ldflags() {
if [ "$enable_network" != "0" ]; then
CFLAGS="$CFLAGS -DENABLE_NETWORK"
- if [ "$os" = "BEOS" ]; then
- LDFLAGS="$LDFLAGS -lbind -lsocket"
- fi
-
if [ "$os" = "HAIKU" ]; then
LDFLAGS="$LDFLAGS -lnetwork"
fi
@@ -2350,7 +2346,7 @@ detect_awk() {
detect_os() {
if [ "$os" = "DETECT" ]; then
- # Detect UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, BEOS, SUNOS, CYGWIN, MINGW, OS2, and DOS
+ # Detect UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, SUNOS, CYGWIN, MINGW, OS2, and DOS
# Try first via dumpmachine, then via uname
os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
@@ -2361,7 +2357,6 @@ detect_os() {
/openbsd/ { print "OPENBSD"; exit}
/netbsd/ { print "NETBSD"; exit}
/hp-ux/ { print "HPUX"; exit}
- /beos/ { print "BEOS"; exit}
/haiku/ { print "HAIKU"; exit}
/sunos/ { print "SUNOS"; exit}
/solaris/ { print "SUNOS"; exit}
@@ -2380,7 +2375,6 @@ detect_os() {
/openbsd/ { print "OPENBSD"; exit}
/netbsd/ { print "NETBSD"; exit}
/hp-ux/ { print "HPUX"; exit}
- /beos/ { print "BEOS"; exit}
/haiku/ { print "HAIKU"; exit}
/sunos/ { print "SUNOS"; exit}
/cygwin/ { print "CYGWIN"; exit}
@@ -2393,7 +2387,7 @@ detect_os() {
if [ -z "$os" ]; then
log 1 "detecting OS... none detected"
log 1 "I couldn't detect your OS. Please use --os=OS to force one"
- log 1 "Allowed values are: UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS"
+ log 1 "Allowed values are: UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS"
exit 1
fi
@@ -3480,7 +3474,7 @@ showhelp() {
echo " --lipo=LIPO the lipo to use (OSX ONLY) [HOST-lipo]"
echo " --os=OS the OS we are compiling for [DETECT]"
echo " DETECT/UNIX/OSX/FREEBSD/DRAGONFLY/OPENBSD/"
- echo " NETBSD/HPUX/BEOS/SUNOS/CYGWIN/"
+ echo " NETBSD/HPUX/SUNOS/CYGWIN/"
echo " MINGW/OS2/DOS/HAIKU"
echo ""
echo "Paths:"
diff --git a/configure b/configure
index 744273a5a..bb3efa316 100755
--- a/configure
+++ b/configure
@@ -117,8 +117,7 @@ AWKCOMMAND='
if ($0 == "AI" && "'$enable_ai'" == "0") { next; }
if ($0 == "COCOA" && "'$with_cocoa'" == "0") { next; }
if ($0 == "DOS" && "'$os'" != "DOS") { next; }
- if ($0 == "BEOS" && "'$os'" != "BEOS" &&
- "'$os'" != "HAIKU") { next; }
+ if ($0 == "HAIKU" && "'$os'" != "HAIKU") { next; }
if ($0 == "WIN32" && "'$os'" != "MINGW" &&
"'$os'" != "CYGWIN" && "'$os'" != "MSVC") { next; }
if ($0 == "MSVC" && "'$os'" != "MSVC") { next; }
diff --git a/projects/generate b/projects/generate
index cfedc8b32..b7d7da26b 100755
--- a/projects/generate
+++ b/projects/generate
@@ -132,7 +132,7 @@ load_main_data() {
if ($0 == "DEDICATED" && "'$enable_dedicated'" != "1") { next; }
if ($0 == "AI" && "'$enable_ai'" == "0") { next; }
if ($0 == "COCOA" && "'$with_cocoa'" == "0") { next; }
- if ($0 == "BEOS" && "'$os'" != "BEOS") { next; }
+ if ($0 == "HAIKU" && "'$os'" != "HAIKU") { next; }
if ($0 == "WIN32" && "'$os'" != "MINGW" &&
"'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
if ($0 == "MSVC" && "'$os'" != "MSVC") { next; }
diff --git a/source.list b/source.list
index 9c2761eaf..22d647dbb 100644
--- a/source.list
+++ b/source.list
@@ -1117,7 +1117,7 @@ music/midifile.cpp
music/extmidi.cpp
#end
#end
-#if BEOS
+#if HAIKU
music/bemidi.cpp
#end
#if LIBTIMIDITY
diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp
index 3541050ac..a7a444cc8 100644
--- a/src/intro_gui.cpp
+++ b/src/intro_gui.cpp
@@ -293,8 +293,6 @@ void AskExitGame()
SetDParam(0, STR_OSNAME_WINDOWS);
#elif defined(__APPLE__)
SetDParam(0, STR_OSNAME_OSX);
-#elif defined(__BEOS__)
- SetDParam(0, STR_OSNAME_BEOS);
#elif defined(__HAIKU__)
SetDParam(0, STR_OSNAME_HAIKU);
#elif defined(__OS2__)
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index 01329000b..9ac3830e6 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -1771,7 +1771,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index d17ed9518..7fe2ac1da 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -1443,7 +1443,6 @@ STR_OSNAME_WINDOWS :ويندوز
STR_OSNAME_DOS :دوس
STR_OSNAME_UNIX :يونكس
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :بي او اس
STR_OSNAME_HAIKU :هايكو
STR_OSNAME_OS2 :او اس/2
STR_OSNAME_SUNOS :صن
diff --git a/src/lang/basque.txt b/src/lang/basque.txt
index 5ffac53a3..1c3b03884 100644
--- a/src/lang/basque.txt
+++ b/src/lang/basque.txt
@@ -1683,7 +1683,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt
index c5bf66d02..64bf4ce1d 100644
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -2096,7 +2096,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 976501921..0bf7addac 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -1787,7 +1787,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index 36af6ab17..3ae4974b4 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -1719,7 +1719,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :ДОС
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index a2b4a71c3..7a817287b 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -1798,7 +1798,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index 3087dd177..9202b68b0 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -1893,7 +1893,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 7ebbff602..e8b8c2a29 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -1865,7 +1865,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unixu
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 63826ba4b..8739dc513 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -1797,7 +1797,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 23a9eb3b5..2babd4c03 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -1797,7 +1797,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 2a5487588..c19275c64 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1801,7 +1801,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt
index 44f4221f4..5deb9abd4 100644
--- a/src/lang/english_AU.txt
+++ b/src/lang/english_AU.txt
@@ -1747,7 +1747,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index 5a0aeef43..28137bd52 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -1801,7 +1801,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index 4d0a637fa..910be6be8 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -1430,7 +1430,6 @@ STR_OSNAME_WINDOWS :Vindozo
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unikso
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index a85cc51ba..f031b77de 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -1831,7 +1831,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt
index bfa670628..a9f862e87 100644
--- a/src/lang/faroese.txt
+++ b/src/lang/faroese.txt
@@ -1594,7 +1594,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index f7196613c..8704a8182 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -1801,7 +1801,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 3a2a7bb3e..2a8cf8dab 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -1798,7 +1798,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt
index 2f465fe0c..958a185c1 100644
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
@@ -1981,7 +1981,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 3bfe8b6d7..5741587d7 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -1774,7 +1774,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 379d4ef98..a2cf57371 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -1792,7 +1792,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index 72bc7de0e..b185997c4 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -1894,7 +1894,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index 7523369e2..3f7f1457e 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -1796,7 +1796,6 @@ STR_OSNAME_WINDOWS :חלונות
STR_OSNAME_DOS :דוס
STR_OSNAME_UNIX :יוניקס
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :מערכת הפעלה בי
STR_OSNAME_HAIKU :הייקו
STR_OSNAME_OS2 :מערכת הפעלה או.אס שתיים
STR_OSNAME_SUNOS :סולריס
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 93a80acc6..5ff6f212d 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -1861,7 +1861,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index 49705f02d..466616e06 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -1635,7 +1635,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index 8f1f6a447..3937bcd76 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -1780,7 +1780,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/irish.txt b/src/lang/irish.txt
index 6a2bcd9c2..3581552a4 100644
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
@@ -1770,7 +1770,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index a0d6c3416..2d931b6bb 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -1821,7 +1821,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 212630206..eac47fcef 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -1770,7 +1770,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index cdd469aa1..ffbbbad2b 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -1798,7 +1798,6 @@ STR_OSNAME_WINDOWS :{G=f}Windows
STR_OSNAME_DOS :{G=f}DOS
STR_OSNAME_UNIX :{G=f}Unix
STR_OSNAME_OSX :{G=f}OS{NBSP}X
-STR_OSNAME_BEOS :{G=f}BeOS
STR_OSNAME_HAIKU :{G=f}Haiku
STR_OSNAME_OS2 :{G=f}OS/2
STR_OSNAME_SUNOS :{G=f}SunOS
diff --git a/src/lang/latin.txt b/src/lang/latin.txt
index 4aee90222..ad37801bc 100644
--- a/src/lang/latin.txt
+++ b/src/lang/latin.txt
@@ -1971,7 +1971,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index 6b7b6a47b..c96d7a433 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -1717,7 +1717,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index bad08f2be..5edd5cb95 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -1989,7 +1989,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index de8e41ca1..ac29b6e65 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -1773,7 +1773,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/malay.txt b/src/lang/malay.txt
index 040d30a0d..a7b69866b 100644
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
@@ -1531,7 +1531,6 @@ STR_OSNAME_WINDOWS :Tetingkap
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index d7c1dd74f..e0efd9fb0 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -1800,7 +1800,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 03cd84e8c..2a71571c2 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -1693,7 +1693,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index 53211734b..d28a741af 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -2169,7 +2169,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 16e23126f..794df12be 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -1798,7 +1798,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 5eea779ac..cb24055ff 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -1747,7 +1747,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 5ebb7fd7a..f74b98740 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -1949,7 +1949,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index b35181aee..9704d5c92 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -1977,7 +1977,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index a4de3f33d..f79922a6f 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -1780,7 +1780,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 73123a7cb..ae4770349 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -1838,7 +1838,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index 282b537a0..b9f22e74d 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -1924,7 +1924,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 7505c90ed..938fcbc7b 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -1783,7 +1783,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt
index 71a2a3375..09d44e716 100644
--- a/src/lang/spanish_MX.txt
+++ b/src/lang/spanish_MX.txt
@@ -1798,7 +1798,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index c89294e30..63c4b75a1 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -1791,7 +1791,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt
index 6054d51d1..ae273e4a1 100644
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
@@ -1540,7 +1540,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/thai.txt b/src/lang/thai.txt
index dfa65c8bf..4a33e7d6b 100644
--- a/src/lang/thai.txt
+++ b/src/lang/thai.txt
@@ -1721,7 +1721,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :ระบบปฏิบัติการ Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index afc065807..0148767be 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -1770,7 +1770,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 09684c587..a5d60f7f2 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -1796,7 +1796,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 857c6eaf6..2e0a9b78f 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -1899,7 +1899,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt
index 41a195c1e..8d93f1936 100644
--- a/src/lang/unfinished/chuvash.txt
+++ b/src/lang/unfinished/chuvash.txt
@@ -665,7 +665,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index 28bd4678c..2c399a520 100644
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -1704,7 +1704,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index 71cc06d42..b25ee84b0 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -952,7 +952,6 @@ STR_QUIT_NO :{BLACK}Не
STR_OSNAME_WINDOWS :Windows
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index 427154cbc..7818d765b 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -1487,7 +1487,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :هایکو
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt
index 9a6283314..988a6c786 100644
--- a/src/lang/unfinished/urdu.txt
+++ b/src/lang/unfinished/urdu.txt
@@ -1384,7 +1384,6 @@ STR_OSNAME_WINDOWS :ونڈوز
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :یونیکس
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt
index 1aca32513..1de743a34 100644
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
@@ -1786,7 +1786,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index ebe3d3f7f..d991c3db3 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -1773,7 +1773,6 @@ STR_OSNAME_WINDOWS :Windows
STR_OSNAME_DOS :DOS
STR_OSNAME_UNIX :Unix
STR_OSNAME_OSX :OS{NBSP}X
-STR_OSNAME_BEOS :BeOS
STR_OSNAME_HAIKU :Haiku
STR_OSNAME_OS2 :OS/2
STR_OSNAME_SUNOS :SunOS
diff --git a/src/network/core/host.cpp b/src/network/core/host.cpp
index 216839032..c2faf4c8b 100644
--- a/src/network/core/host.cpp
+++ b/src/network/core/host.cpp
@@ -24,7 +24,7 @@
*/
static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast);
-#if defined(BEOS_NET_SERVER) || defined(__HAIKU__) /* doesn't have neither getifaddrs or net/if.h */
+#if defined(__HAIKU__) /* doesn't have neither getifaddrs or net/if.h */
/* Based on Andrew Bachmann's netstat+.c. Big thanks to him! */
extern "C" int _netstat(int fd, char **output, int verbose);
diff --git a/src/network/core/os_abstraction.h b/src/network/core/os_abstraction.h
index 187e2584c..084f763c2 100644
--- a/src/network/core/os_abstraction.h
+++ b/src/network/core/os_abstraction.h
@@ -49,9 +49,7 @@ typedef unsigned long in_addr_t;
# define SOCKET int
# define INVALID_SOCKET -1
# define ioctlsocket ioctl
-# if !defined(BEOS_NET_SERVER)
-# define closesocket close
-# endif
+# define closesocket close
# define GET_LAST_ERROR() (errno)
/* Need this for FIONREAD on solaris */
# define BSD_COMP
@@ -59,37 +57,25 @@ typedef unsigned long in_addr_t;
/* Includes needed for UNIX-like systems */
# include <unistd.h>
# include <sys/ioctl.h>
-# if defined(__BEOS__) && defined(BEOS_NET_SERVER)
-# include <be/net/socket.h>
-# include <be/kernel/OS.h> /* snooze() */
-# include <be/net/netdb.h>
- typedef unsigned long in_addr_t;
-# define INADDR_NONE INADDR_BROADCAST
-# else
-# include <sys/socket.h>
-# include <netinet/in.h>
-# include <netinet/tcp.h>
-# include <arpa/inet.h>
-# include <net/if.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <netinet/tcp.h>
+# include <arpa/inet.h>
+# include <net/if.h>
/* According to glibc/NEWS, <ifaddrs.h> appeared in glibc-2.3. */
-# if !defined(__sgi__) && !defined(SUNOS) && !defined(__BEOS__) && !defined(__HAIKU__) && !defined(__INNOTEK_LIBC__) \
- && !(defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 2)) && !defined(__dietlibc__) && !defined(HPUX)
+# if !defined(__sgi__) && !defined(SUNOS) && !defined(__HAIKU__) && !defined(__INNOTEK_LIBC__) \
+ && !(defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 2)) && !defined(__dietlibc__) && !defined(HPUX)
/* If for any reason ifaddrs.h does not exist on your system, comment out
* the following two lines and an alternative way will be used to fetch
* the list of IPs from the system. */
-# include <ifaddrs.h>
-# define HAVE_GETIFADDRS
-# endif
-# if !defined(INADDR_NONE)
-# define INADDR_NONE 0xffffffff
-# endif
-# if defined(__BEOS__) && !defined(BEOS_NET_SERVER)
- /* needed on Zeta */
-# include <sys/sockio.h>
-# endif
-# endif /* BEOS_NET_SERVER */
-
-# if !defined(__BEOS__) && defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)
+# include <ifaddrs.h>
+# define HAVE_GETIFADDRS
+# endif
+# if !defined(INADDR_NONE)
+# define INADDR_NONE 0xffffffff
+# endif
+
+# if defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)
typedef uint32_t in_addr_t;
# endif
@@ -98,10 +84,6 @@ typedef unsigned long in_addr_t;
# include <netdb.h>
#endif /* UNIX */
-#ifdef __BEOS__
- typedef int socklen_t;
-#endif
-
#ifdef __HAIKU__
#define IPV6_V6ONLY 27
#endif
@@ -174,11 +156,7 @@ static inline bool SetNonBlocking(SOCKET d)
#else
int nonblocking = 1;
#endif
-#if (defined(__BEOS__) && defined(BEOS_NET_SERVER))
- return setsockopt(d, SOL_SOCKET, SO_NONBLOCK, &nonblocking, sizeof(nonblocking)) == 0;
-#else
return ioctlsocket(d, FIONBIO, &nonblocking) == 0;
-#endif
}
/**
@@ -189,13 +167,9 @@ static inline bool SetNonBlocking(SOCKET d)
static inline bool SetNoDelay(SOCKET d)
{
/* XXX should this be done at all? */
-#if !defined(BEOS_NET_SERVER) /* not implemented on BeOS net_server */
int b = 1;
/* The (const char*) cast is needed for windows */
return setsockopt(d, IPPROTO_TCP, TCP_NODELAY, (const char*)&b, sizeof(b)) == 0;
-#else
- return true;
-#endif
}
/* Make sure these structures have the size we expect them to be */
diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp
index d2dc15d42..1f34d15b0 100644
--- a/src/network/core/udp.cpp
+++ b/src/network/core/udp.cpp
@@ -94,7 +94,6 @@ void NetworkUDPSocketHandler::SendPacket(Packet *p, NetworkAddress *recv, bool a
p->PrepareToSend();
-#ifndef BEOS_NET_SERVER /* will work around this, some day; maybe. */
if (broadcast) {
/* Enable broadcast */
unsigned long val = 1;
@@ -102,7 +101,6 @@ void NetworkUDPSocketHandler::SendPacket(Packet *p, NetworkAddress *recv, bool a
DEBUG(net, 1, "[udp] setting broadcast failed with: %i", GET_LAST_ERROR());
}
}
-#endif
/* Send the buffer */
int res = sendto(s->second, (const char*)p->buffer, p->size, 0, (const struct sockaddr *)send.GetAddress(), send.GetAddressLength());
diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp
index 810b062a6..2f982dea0 100644
--- a/src/os/unix/unix.cpp
+++ b/src/os/unix/unix.cpp
@@ -270,11 +270,7 @@ bool GetClipboardContents(char *buffer, const char *last)
void CSleep(int milliseconds)
{
- #if defined(__BEOS__)
- snooze(milliseconds * 1000);
- #else
- usleep(milliseconds * 1000);
- #endif
+ usleep(milliseconds * 1000);
}
diff --git a/src/stdafx.h b/src/stdafx.h
index ac53b6c63..1f1181b15 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -16,7 +16,7 @@
#include "os/macosx/osx_stdafx.h"
#endif /* __APPLE__ */
-#if defined(__BEOS__) || defined(__HAIKU__)
+#if defined(__HAIKU__)
#include <SupportDefs.h>
#include <unistd.h>
#define _GNU_SOURCE
@@ -304,12 +304,12 @@
typedef unsigned char byte;
/* This is already defined in unix, but not in QNX Neutrino (6.x)*/
-#if (!defined(UNIX) && !defined(__CYGWIN__) && !defined(__BEOS__) && !defined(__HAIKU__)) || defined(__QNXNTO__)
+#if (!defined(UNIX) && !defined(__CYGWIN__) && !defined(__HAIKU__)) || defined(__QNXNTO__)
typedef unsigned int uint;
#endif
#if defined(TROUBLED_INTS)
- /* NDS'/BeOS'/Haiku's types for uint32/int32 are based on longs, which causes
+ /* Haiku's types for uint32/int32 are based on longs, which causes
* trouble all over the place in OpenTTD. */
#define uint32 uint32_ugly_hack
#define int32 int32_ugly_hack
diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp
index 47fa64231..3b053c7d6 100644
--- a/src/video/dedicated_v.cpp
+++ b/src/video/dedicated_v.cpp
@@ -26,10 +26,6 @@
#include "../saveload/saveload.h"
#include "dedicated_v.h"
-#ifdef BEOS_NET_SERVER
-#include <net/socket.h>
-#endif
-
#ifdef __OS2__
# include <sys/time.h> /* gettimeofday */
# include <sys/types.h>
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index 2a636d1aa..54502dfae 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -496,8 +496,6 @@ static uint ConvertSdlKeyIntoMy(SDL_keysym *sym, WChar *character)
if (sym->scancode == 41) key = WKC_BACKQUOTE;
#elif defined(__APPLE__)
if (sym->scancode == 10) key = WKC_BACKQUOTE;
-#elif defined(__BEOS__)
- if (sym->scancode == 17) key = WKC_BACKQUOTE;
#elif defined(__SVR4) && defined(__sun)
if (sym->scancode == 60) key = WKC_BACKQUOTE;
if (sym->scancode == 49) key = WKC_BACKSPACE;