diff options
| author | tron <tron@openttd.org> | 2004-11-15 07:53:09 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2004-11-15 07:53:09 +0000 |
| commit | 5a07c9bd71826484de50d265cd11cc85e4a07470 (patch) | |
| tree | 073181c3941ba1487393bfb26eef3b336c95af04 /makefiledir | |
| parent | 485247434373200909ba90baf426ff3b55b1f80f (diff) | |
| download | openttd-5a07c9bd71826484de50d265cd11cc85e4a07470.tar.xz | |
(svn r619) Add the necessary bits to make building under BeOS using GNU Make work
Diffstat (limited to 'makefiledir')
| -rw-r--r-- | makefiledir/Makefile.config_writer | 2 | ||||
| -rw-r--r-- | makefiledir/Makefile.libdetection | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index 55315a07c..cf02dbfa8 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -76,12 +76,14 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,OSX:=$(OSX)) $(call CONFIG_LINE,FREEBSD:=$(FREEBSD)) $(call CONFIG_LINE,MORPHOS:=$(MORPHOS)) + $(call CONFIG_LINE,BEOS:=$(BEOS)) $(call CONFIG_LINE,CYGWIN:=$(CYGWIN)) $(call CONFIG_LINE,MINGW:=$(MINGW)) $(call CONFIG_LINE,) $(call CONFIG_LINE,\# misc) $(call CONFIG_LINE,SDL-CONFIG:=$(SDL-CONFIG)) + $(call CONFIG_LINE,BEOS_NET_SERVER:=$(BEOS_NET_SERVER)) $(call CONFIG_LINE,CONFIG_INCLUDED:=yes) $(call CONFIG_LINE,PATH_SET:=$(PATH_SET)) $(call CONFIG_LINE,CONFIG_VERSION:=$(MAKEFILE_VERSION)) diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection index 8f8458c76..084d13707 100644 --- a/makefiledir/Makefile.libdetection +++ b/makefiledir/Makefile.libdetection @@ -28,6 +28,17 @@ MORPHOS:=1 UNIX:=1 endif +# Automatically recognize if building on BeOS +ifeq ($(shell uname), BeOS) +BEOS:=1 +# BeOS uses UNIX setup too +UNIX:=1 +# Except that in BeOS 5.0 we need to use net_server, not BONE networking +ifeq ($(shell uname -r), 5.0) +BEOS_NET_SERVER:=1 +endif +endif + # FreeBSD uses sdl11 instead of sdl ifdef FREEBSD SDL-CONFIG:=sdl11-config @@ -77,4 +88,4 @@ ifndef BIN_DIR endif endif endif -endif
\ No newline at end of file +endif |