(svn r17336) -Codechange: move some os specific files into src/os/

10 files changed, 38 insertions, 38 deletions

diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 8dd4f5c97..4116705c0 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -51,7 +51,7 @@ enum {
 #ifdef WIN32
 #include <windows.h>
 #include <shlobj.h> /* SHGetFolderPath */
-#include "win32.h"
+#include "os/windows/win32.h"
 
 /**
  * Get the short DOS 8.3 format for paths.
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp
index 5042571ad..988884b8f 100644
--- a/src/music/dmusic.cpp
+++ b/src/music/dmusic.cpp
@@ -16,7 +16,7 @@
 	#undef WIN32_LEAN_AND_MEAN // Don't exclude rarely-used stuff from Windows headers
 #endif
 #include "../debug.h"
-#include "../win32.h"
+#include "../os/windows/win32.h"
 #include "dmusic.h"
 
 #include <windows.h>
diff --git a/src/os2.cpp b/src/os/os2/os2.cpp
index a40a46c84..06508b361 100644
--- a/src/os2.cpp
+++ b/src/os/os2/os2.cpp
@@ -9,16 +9,16 @@
 
 /** @file os2.cpp OS2 related OS support. */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "variables.h"
-#include "gui.h"
-#include "fileio_func.h"
-#include "fios.h"
-#include "functions.h"
-#include "core/random_func.hpp"
-#include "string_func.h"
-#include "textbuf_gui.h"
+#include "../../stdafx.h"
+#include "../../openttd.h"
+#include "../../variables.h"
+#include "../../gui.h"
+#include "../../fileio_func.h"
+#include "../../fios.h"
+#include "../../functions.h"
+#include "../../core/random_func.hpp"
+#include "../../string_func.h"
+#include "../../textbuf_gui.h"
 
 #include "table/strings.h"
 
diff --git a/src/unix.cpp b/src/os/unix/unix.cpp
index dc55a3a37..bbe916c57 100644
--- a/src/unix.cpp
+++ b/src/os/unix/unix.cpp
@@ -9,12 +9,12 @@
 
 /** @file unix.cpp Implementation of Unix specific file handling. */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "variables.h"
-#include "textbuf_gui.h"
-#include "functions.h"
-#include "core/random_func.hpp"
+#include "../../stdafx.h"
+#include "../../openttd.h"
+#include "../../variables.h"
+#include "../../textbuf_gui.h"
+#include "../../functions.h"
+#include "../../core/random_func.hpp"
 
 #include "table/strings.h"
 
@@ -117,8 +117,8 @@ bool FiosIsHiddenFile(const struct dirent *ent)
 
 #include <iconv.h>
 #include <errno.h>
-#include "debug.h"
-#include "string_func.h"
+#include "../../debug.h"
+#include "../../string_func.h"
 
 const char *GetCurrentLocale(const char *param);
 
diff --git a/src/masm64.rules b/src/os/windows/masm64.rules
index 62e6e0f8b..62e6e0f8b 100644
--- a/src/masm64.rules
+++ b/src/os/windows/masm64.rules
diff --git a/src/ottdres.rc.in b/src/os/windows/ottdres.rc.in
index f0989f5bb..f0989f5bb 100644
--- a/src/ottdres.rc.in
+++ b/src/os/windows/ottdres.rc.in
diff --git a/src/win32.cpp b/src/os/windows/win32.cpp
index d262abebd..432755fbe 100644
--- a/src/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -9,35 +9,35 @@
 
 /** @file win32.cpp Implementation of MS Windows system calls */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "debug.h"
-#include "saveload/saveload.h"
-#include "gfx_func.h"
-#include "textbuf_gui.h"
-#include "fileio_func.h"
-#include "fios.h"
-#include "rev.h"
+#include "../../stdafx.h"
+#include "../../openttd.h"
+#include "../../debug.h"
+#include "../../saveload/saveload.h"
+#include "../../gfx_func.h"
+#include "../../textbuf_gui.h"
+#include "../../fileio_func.h"
+#include "../../fios.h"
+#include "../../rev.h"
 #include <windows.h>
 #include <winnt.h>
 #include <wininet.h>
 #include <fcntl.h>
 #include <shlobj.h> /* SHGetFolderPath */
-#include "variables.h"
+#include "../../variables.h"
 #include "win32.h"
-#include "core/alloc_func.hpp"
-#include "functions.h"
-#include "core/random_func.hpp"
-#include "core/bitmath_func.hpp"
-#include "string_func.h"
-#include "gamelog.h"
+#include "../../core/alloc_func.hpp"
+#include "../../functions.h"
+#include "../../core/random_func.hpp"
+#include "../../core/bitmath_func.hpp"
+#include "../../string_func.h"
+#include "../../gamelog.h"
 #include <ctype.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #if defined(_MSC_VER) && !defined(WINCE)
 	#include <dbghelp.h>
-	#include "strings_func.h"
+	#include "../../strings_func.h"
 #endif
 
 static bool _has_console;
diff --git a/src/win32.h b/src/os/windows/win32.h
index 19f04d1f2..19f04d1f2 100644
--- a/src/win32.h
+++ b/src/os/windows/win32.h
diff --git a/src/win64.asm b/src/os/windows/win64.asm
index d95bc3898..d95bc3898 100644
--- a/src/win64.asm
+++ b/src/os/windows/win64.asm
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index fffb86770..efa4295ed 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -13,7 +13,7 @@
 #include "../openttd.h"
 #include "../gfx_func.h"
 #include "../variables.h"
-#include "../win32.h"
+#include "../os/windows/win32.h"
 #include "../rev.h"
 #include "../blitter/factory.hpp"
 #include "../network/network.h"