mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(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.

release/0.5
truelight 2006-08-20 13:48:04 +00:00
parent a06d5548eb
commit f73b17323e
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -511,6 +511,10 @@ ifdef DISABLE_ASSERTS
CFLAGS += -DNDEBUG CFLAGS += -DNDEBUG
endif endif
ifdef NO_THREADS
CFLAGS += -DNO_THREADS
endif
# automatically disables asserts for release # automatically disables asserts for release
ifdef RELEASE ifdef RELEASE
ifndef ENABLE_ASSERTS ifndef ENABLE_ASSERTS

2
makefiledir/Makefile.config_writer
View File

@ -32,6 +32,8 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,\# Disable asserts. Leave them on for easier bug finding) $(call CONFIG_LINE,\# Disable asserts. Leave them on for easier bug finding)
$(call CONFIG_LINE,DISABLE_ASSERTS:=$(DISABLE_ASSERTS)) $(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,)
$(call CONFIG_LINE,\# See Makefile for details on these paths) $(call CONFIG_LINE,\# See Makefile for details on these paths)

4
thread.c
View File

@ -4,10 +4,10 @@
#include "thread.h" #include "thread.h"
#include <stdlib.h> #include <stdlib.h>
#if defined(__AMIGA__) || defined(__MORPHOS__) #if defined(__AMIGA__) || defined(__MORPHOS__) || defined(NO_THREADS)
OTTDThread *OTTDCreateThread(OTTDThreadFunc function, void *arg) { return NULL; } OTTDThread *OTTDCreateThread(OTTDThreadFunc function, void *arg) { return NULL; }
void *OTTDJoinThread(OTTDThread *t) { return NULL; } void *OTTDJoinThread(OTTDThread *t) { return NULL; }
void OTTDExitThread() { NOT_REACHED(); }; void OTTDExitThread(void) { NOT_REACHED(); };
#elif defined(__OS2__) #elif defined(__OS2__)