(svn r2710) Simplify dedicated server code a bit and don't compile it at all, if network support ist disabled
--- a/dedicated.c Mon Jul 25 11:36:02 2005 +0000
+++ b/dedicated.c Mon Jul 25 16:33:58 2005 +0000
@@ -1,32 +1,17 @@
/* $Id$ */
#include "stdafx.h"
-#include "openttd.h"
#ifdef ENABLE_NETWORK
+#if defined(UNIX) && !defined(__MORPHOS__)
+
+#include "openttd.h"
#include "variables.h"
-#ifdef __OS2__
-# include <sys/types.h>
-# include <unistd.h>
-#endif
-
-#ifdef UNIX
-# include <sys/types.h>
-# include <unistd.h>
-#endif
+#include <sys/types.h>
+#include <unistd.h>
-#ifdef __MORPHOS__
-/* Voids the fork, option will be disabled for MorphOS build anyway, because
- * MorphOS doesn't support forking (could only implemented with lots of code
- * changes here). */
-int fork(void) { return -1; }
-int dup2(int oldd, int newd) { return -1; }
-#endif
-
-#ifdef UNIX
-/* We want to fork our dedicated server */
void DedicatedFork(void)
{
/* Fork the program */
--- a/os2.c Mon Jul 25 11:36:02 2005 +0000
+++ b/os2.c Mon Jul 25 16:33:58 2005 +0000
@@ -437,7 +437,9 @@
#if defined(WITH_SDL)
{ "sdl", "SDL Video Driver", &_sdl_video_driver, 1},
#endif
+#ifdef ENABLE_NETWORK
{ "dedicated", "Dedicated Video Driver", &_dedicated_video_driver, 0},
+#endif
{ NULL, NULL, NULL, 0}
};
--- a/unix.c Mon Jul 25 11:36:02 2005 +0000
+++ b/unix.c Mon Jul 25 16:33:58 2005 +0000
@@ -378,7 +378,9 @@
#if defined(WITH_SDL)
{ "sdl", "SDL Video Driver", &_sdl_video_driver, 1},
#endif
+#ifdef ENABLE_NETWORK
{ "dedicated", "Dedicated Video Driver", &_dedicated_video_driver, 0},
+#endif
{ NULL, NULL, NULL, 0}
};
--- a/video/dedicated_v.c Mon Jul 25 11:36:02 2005 +0000
+++ b/video/dedicated_v.c Mon Jul 25 16:33:58 2005 +0000
@@ -1,11 +1,10 @@
/* $Id$ */
#include "../stdafx.h"
-#include "../openttd.h"
-#include "dedicated_v.h"
#ifdef ENABLE_NETWORK
+#include "../openttd.h"
#include "../debug.h"
#include "../functions.h"
#include "../gfx.h"
@@ -14,6 +13,7 @@
#include "../command.h"
#include "../console.h"
#include "../variables.h"
+#include "dedicated_v.h"
#ifdef __OS2__
# include <sys/time.h> /* gettimeofday */
@@ -281,23 +281,6 @@
}
}
-#else
-
-static const char *DedicatedVideoStart(const char * const *parm)
-{
- DEBUG(misc, 0) ("OpenTTD compiled without network support, exiting.");
-
- return NULL;
-}
-
-static void DedicatedVideoStop(void) {}
-static void DedicatedVideoMakeDirty(int left, int top, int width, int height) {}
-static bool DedicatedVideoChangeRes(int w, int h) { return false; }
-static void DedicatedVideoFullScreen(bool fs) {}
-static int DedicatedVideoMainLoop(void) { return ML_QUIT; }
-
-#endif /* ENABLE_NETWORK */
-
const HalVideoDriver _dedicated_video_driver = {
DedicatedVideoStart,
DedicatedVideoStop,
@@ -306,3 +289,5 @@
DedicatedVideoChangeRes,
DedicatedVideoFullScreen,
};
+
+#endif /* ENABLE_NETWORK */
--- a/win32.c Mon Jul 25 11:36:02 2005 +0000
+++ b/win32.c Mon Jul 25 16:33:58 2005 +0000
@@ -942,7 +942,9 @@
{"sdl", "SDL Video Driver", &_sdl_video_driver, 1},
#endif
{"win32", "Win32 GDI Video Driver", &_win32_video_driver, Windows_NT3_51},
+#ifdef ENABLE_NETWORK
{ "dedicated", "Dedicated Video Driver", &_dedicated_video_driver, 0},
+#endif
{ NULL, NULL, NULL, 0 }
};