(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build

8 files changed, 46 insertions, 41 deletions

diff --git a/video/dedicated_v.c b/video/dedicated_v.c
index 6440d6fe9..5396ad348 100644
--- a/video/dedicated_v.c
+++ b/video/dedicated_v.c
@@ -1,19 +1,19 @@
 /* $Id$ */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "debug.h"
-#include "functions.h"
-#include "network.h"
-#include "video/dedicated_v.h"
+#include "../stdafx.h"
+#include "../openttd.h"
+#include "dedicated_v.h"
 
 #ifdef ENABLE_NETWORK
 
-#include "gfx.h"
-#include "window.h"
-#include "command.h"
-#include "console.h"
-#include "variables.h"
+#include "../debug.h"
+#include "../functions.h"
+#include "../gfx.h"
+#include "../network.h"
+#include "../window.h"
+#include "../command.h"
+#include "../console.h"
+#include "../variables.h"
 
 #ifdef __OS2__
 #	include <sys/time.h> /* gettimeofday */
diff --git a/video/dedicated_v.h b/video/dedicated_v.h
index 61a76a95d..9ba1223d3 100644
--- a/video/dedicated_v.h
+++ b/video/dedicated_v.h
@@ -3,7 +3,7 @@
 #ifndef VIDEO_DEDICATED_H
 #define VIDEO_DEDICATED_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalVideoDriver _dedicated_video_driver;
 
diff --git a/video/null_v.c b/video/null_v.c
index 8f7cee988..0e3e330b1 100644
--- a/video/null_v.c
+++ b/video/null_v.c
@@ -1,11 +1,11 @@
 /* $Id$ */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "gfx.h"
-#include "variables.h"
-#include "video/null_v.h"
-#include "window.h"
+#include "../stdafx.h"
+#include "../openttd.h"
+#include "../gfx.h"
+#include "../variables.h"
+#include "../window.h"
+#include "null_v.h"
 
 static void* _null_video_mem = NULL;
 
diff --git a/video/null_v.h b/video/null_v.h
index cb84c4cfd..56922d9b3 100644
--- a/video/null_v.h
+++ b/video/null_v.h
@@ -3,7 +3,7 @@
 #ifndef VIDEO_NULL_H
 #define VIDEO_NULL_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalVideoDriver _null_video_driver;
 
diff --git a/video/sdl_v.c b/video/sdl_v.c
index 462b5d309..0ff082f17 100644
--- a/video/sdl_v.c
+++ b/video/sdl_v.c
@@ -1,17 +1,20 @@
 /* $Id$ */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "debug.h"
-#include "functions.h"
-#include "gfx.h"
-#include "macros.h"
-#include "sdl.h"
-#include "window.h"
-#include "video/sdl_v.h"
+#include "../stdafx.h"
+
+#ifdef WITH_SDL
+
+#include "../openttd.h"
+#include "../debug.h"
+#include "../functions.h"
+#include "../gfx.h"
+#include "../macros.h"
+#include "../sdl.h"
+#include "../window.h"
+#include "../network.h"
+#include "../variables.h"
+#include "sdl_v.h"
 #include <SDL.h>
-#include "network.h"
-#include "variables.h"
 
 static SDL_Surface *_sdl_screen;
 static bool _all_modes;
@@ -488,3 +491,5 @@ const HalVideoDriver _sdl_video_driver = {
 	SdlVideoChangeRes,
 	SdlVideoFullScreen,
 };
+
+#endif
diff --git a/video/sdl_v.h b/video/sdl_v.h
index 78fa48f4a..07ba50f3c 100644
--- a/video/sdl_v.h
+++ b/video/sdl_v.h
@@ -3,7 +3,7 @@
 #ifndef VIDEO_SDL_H
 #define VIDEO_SDL_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalVideoDriver _sdl_video_driver;
 
diff --git a/video/win32_v.c b/video/win32_v.c
index fdd74dc98..6710459ef 100644
--- a/video/win32_v.c
+++ b/video/win32_v.c
@@ -1,14 +1,14 @@
 /* $Id$ */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "functions.h"
-#include "gfx.h"
-#include "macros.h"
-#include "network.h"
-#include "variables.h"
-#include "window.h"
-#include "video/win32_v.h"
+#include "../stdafx.h"
+#include "../openttd.h"
+#include "../functions.h"
+#include "../gfx.h"
+#include "../macros.h"
+#include "../network.h"
+#include "../variables.h"
+#include "../window.h"
+#include "win32_v.h"
 #include <windows.h>
 
 static struct {
diff --git a/video/win32_v.h b/video/win32_v.h
index eba72cc8f..ccc9aed94 100644
--- a/video/win32_v.h
+++ b/video/win32_v.h
@@ -3,7 +3,7 @@
 #ifndef VIDEO_WIN32_H
 #define VIDEO_WIN32_H
 
-#include "hal.h"
+#include "../hal.h"
 
 bool MyShowCursor(bool show);