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

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.

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>

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"
 

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);
 

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;

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"