Mercurial > hg > openttd
changeset 4324:79b2bec2c27a draft
(svn r5978) -Add: allow a switch in Makefile.config to disable threads in OpenTTD (no matter what system you are on). Only useful for testing.
| author | truelight <truelight@openttd.org> |
|---|---|
| date | Sun, 20 Aug 2006 13:48:04 +0000 |
| parents | 26b70a40ebcd |
| children | 06559d8dfdcc |
| files | Makefile makefiledir/Makefile.config_writer thread.c |
| diffstat | 3 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile +++ b/Makefile @@ -511,6 +511,10 @@ CFLAGS += -DNDEBUG endif +ifdef NO_THREADS +CFLAGS += -DNO_THREADS +endif + # automatically disables asserts for release ifdef RELEASE ifndef ENABLE_ASSERTS
--- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -32,6 +32,8 @@ $(call CONFIG_LINE,\# Disable asserts. Leave them on for easier bug finding) $(call CONFIG_LINE,DISABLE_ASSERTS:=$(DISABLE_ASSERTS)) + $(call CONFIG_LINE,\# Disable threads. Useful if you do not like it and for testing) + $(call CONFIG_LINE,NO_THREADS:=$(NO_THREADS)) $(call CONFIG_LINE,) $(call CONFIG_LINE,\# See Makefile for details on these paths)
--- a/thread.c +++ b/thread.c @@ -4,10 +4,10 @@ #include "thread.h" #include <stdlib.h> -#if defined(__AMIGA__) || defined(__MORPHOS__) -OTTDThread* OTTDCreateThread(OTTDThreadFunc function, void* arg) { return NULL; } -void* OTTDJoinThread(OTTDThread* t) { return NULL; } -void OTTDExitThread() { NOT_REACHED(); }; +#if defined(__AMIGA__) || defined(__MORPHOS__) || defined(NO_THREADS) +OTTDThread *OTTDCreateThread(OTTDThreadFunc function, void *arg) { return NULL; } +void *OTTDJoinThread(OTTDThread *t) { return NULL; } +void OTTDExitThread(void) { NOT_REACHED(); }; #elif defined(__OS2__)