summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2005-05-16 12:15:34 +0000
committerDarkvater <darkvater@openttd.org>2005-05-16 12:15:34 +0000
commit3bd76dad5bd738e07d4cd72d6816f9177448b3bc (patch)
treebe84391b9ca0b9d85bbe93c33fc8ad0e555a850e
parentb18e4d1a8d5965a658651135f80c911ef2dc2f80 (diff)
downloadopenttd-3bd76dad5bd738e07d4cd72d6816f9177448b3bc.tar.xz
(svn r2330) - Fix: link error when compiling as dedicated. Add sdl.c to always compile in makefile as it is always protected by WITH_SDL and add a stub for ToggleFullScreen()
-rw-r--r--Makefile5
-rw-r--r--sdl.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 214fdee53..6200c2b6c 100644
--- a/Makefile
+++ b/Makefile
@@ -687,13 +687,10 @@ C_SOURCES += water_cmd.c
C_SOURCES += waypoint.c
C_SOURCES += widget.c
C_SOURCES += window.c
+C_SOURCES += sdl.c
CXX_SOURCES =
-ifdef WITH_SDL
-C_SOURCES += sdl.c
-endif
-
ifdef WIN32
C_SOURCES += win32.c w32dm.c
else
diff --git a/sdl.c b/sdl.c
index f6f5fe926..c81fb66d6 100644
--- a/sdl.c
+++ b/sdl.c
@@ -706,4 +706,9 @@ static void DbgRedraw()
}
#endif
-#endif // WITH_SDL
+#else
+
+/* Stub for dedicated server */
+void ToggleFullScreen(bool full_screen) {}
+
+#endif /* WITH_SDL */