summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.src.in6
-rw-r--r--os/windows/installer/build_installers.bat (renamed from os/win32/installer/build_installers.bat)0
-rw-r--r--os/windows/installer/cdfinder.ini (renamed from os/win32/installer/cdfinder.ini)0
-rw-r--r--os/windows/installer/install.nsi (renamed from os/win32/installer/install.nsi)0
-rw-r--r--os/windows/installer/top.bmp (renamed from os/win32/installer/top.bmp)bin25820 -> 25820 bytes
-rw-r--r--os/windows/installer/version_win32.txt (renamed from os/win32/installer/version_win32.txt)0
-rw-r--r--os/windows/installer/version_win64.txt (renamed from os/win32/installer/version_win64.txt)0
-rw-r--r--os/windows/installer/version_win9x.txt (renamed from os/win32/installer/version_win9x.txt)0
-rw-r--r--os/windows/installer/welcome.bmp (renamed from os/win32/installer/welcome.bmp)bin154544 -> 154544 bytes
-rwxr-xr-xprojects/determineversion.vbs4
-rw-r--r--projects/openttd_vs80.vcproj10
-rw-r--r--projects/openttd_vs80.vcproj.in4
-rw-r--r--projects/openttd_vs90.vcproj10
-rw-r--r--projects/openttd_vs90.vcproj.in4
-rw-r--r--source.list14
-rw-r--r--src/fontcache.cpp2
-rw-r--r--src/music/dmusic.cpp2
-rw-r--r--src/os/os2/os2.cpp (renamed from src/os2.cpp)20
-rw-r--r--src/os/unix/unix.cpp (renamed from src/unix.cpp)16
-rw-r--r--src/os/windows/masm64.rules (renamed from src/masm64.rules)0
-rw-r--r--src/os/windows/ottdres.rc.in (renamed from src/ottdres.rc.in)0
-rw-r--r--src/os/windows/win32.cpp (renamed from src/win32.cpp)34
-rw-r--r--src/os/windows/win32.h (renamed from src/win32.h)0
-rw-r--r--src/os/windows/win64.asm (renamed from src/win64.asm)0
-rw-r--r--src/video/win32_v.cpp2
25 files changed, 64 insertions, 64 deletions
diff --git a/Makefile.src.in b/Makefile.src.in
index 739a9aa3b..e0083ce2a 100644
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -278,8 +278,8 @@ $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
$(SRC_DIR)/rev.cpp: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/rev.cpp.in
$(Q)cat $(SRC_DIR)/rev.cpp.in | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/rev.cpp
-$(SRC_DIR)/ottdres.rc: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/ottdres.rc.in
- $(Q)cat $(SRC_DIR)/ottdres.rc.in | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/ottdres.rc
+$(SRC_DIR)/os/windows/ottdres.rc: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/os/windows/ottdres.rc.in
+ $(Q)cat $(SRC_DIR)/os/windows/ottdres.rc.in | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/os/windows/ottdres.rc
FORCE:
@@ -290,7 +290,7 @@ clean:
$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)
mrproper: clean
- $(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/ottdres.rc
+ $(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/os/windows/ottdres.rc
%.o:
@echo '$(STAGE) No such source-file: $(@:%.o=%).[c|cpp|mm|rc]'
diff --git a/os/win32/installer/build_installers.bat b/os/windows/installer/build_installers.bat
index 73a2898da..73a2898da 100644
--- a/os/win32/installer/build_installers.bat
+++ b/os/windows/installer/build_installers.bat
diff --git a/os/win32/installer/cdfinder.ini b/os/windows/installer/cdfinder.ini
index 45f9602f1..45f9602f1 100644
--- a/os/win32/installer/cdfinder.ini
+++ b/os/windows/installer/cdfinder.ini
diff --git a/os/win32/installer/install.nsi b/os/windows/installer/install.nsi
index 69534505a..69534505a 100644
--- a/os/win32/installer/install.nsi
+++ b/os/windows/installer/install.nsi
diff --git a/os/win32/installer/top.bmp b/os/windows/installer/top.bmp
index 15a170ec1..15a170ec1 100644
--- a/os/win32/installer/top.bmp
+++ b/os/windows/installer/top.bmp
Binary files differ
diff --git a/os/win32/installer/version_win32.txt b/os/windows/installer/version_win32.txt
index ed7f77e3d..ed7f77e3d 100644
--- a/os/win32/installer/version_win32.txt
+++ b/os/windows/installer/version_win32.txt
diff --git a/os/win32/installer/version_win64.txt b/os/windows/installer/version_win64.txt
index 3c84447b6..3c84447b6 100644
--- a/os/win32/installer/version_win64.txt
+++ b/os/windows/installer/version_win64.txt
diff --git a/os/win32/installer/version_win9x.txt b/os/windows/installer/version_win9x.txt
index be20888e5..be20888e5 100644
--- a/os/win32/installer/version_win9x.txt
+++ b/os/windows/installer/version_win9x.txt
diff --git a/os/win32/installer/welcome.bmp b/os/windows/installer/welcome.bmp
index 8df4fa899..8df4fa899 100644
--- a/os/win32/installer/welcome.bmp
+++ b/os/windows/installer/welcome.bmp
Binary files differ
diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs
index 7104b833a..1c6f48552 100755
--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -44,7 +44,7 @@ Sub UpdateFiles(version)
End If
UpdateFile modified, revision, version, cur_date, "../src/rev.cpp"
- UpdateFile modified, revision, version, cur_date, "../src/ottdres.rc"
+ UpdateFile modified, revision, version, cur_date, "../src/os/windows/ottdres.rc"
End Sub
Function ReadRegistryKey(shive, subkey, valuename, architecture)
@@ -286,6 +286,6 @@ End Function
Dim version
version = DetermineSVNVersion
-If Not (IsCachedVersion(version) And CheckFile("../src/rev.cpp") And CheckFile("../src/ottdres.rc")) Then
+If Not (IsCachedVersion(version) And CheckFile("../src/rev.cpp") And CheckFile("../src/os/windows/ottdres.rc")) Then
UpdateFiles version
End If
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 9e868d5f6..566353e7b 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -16,7 +16,7 @@
</Platforms>
<ToolFiles>
<ToolFile
- RelativePath="..\src\masm64.rules"
+ RelativePath="..\src\os\windows\masm64.rules"
/>
</ToolFiles>
<Configurations>
@@ -652,7 +652,7 @@
>
</File>
<File
- RelativePath=".\..\src\ottdres.rc"
+ RelativePath=".\..\src\os\windows\ottdres.rc"
>
</File>
<File
@@ -764,7 +764,7 @@
>
</File>
<File
- RelativePath=".\..\src\win32.cpp"
+ RelativePath=".\..\src\os\windows\win32.cpp"
>
</File>
<File
@@ -1624,7 +1624,7 @@
>
</File>
<File
- RelativePath=".\..\src\win32.h"
+ RelativePath=".\..\src\os\windows\win32.h"
>
</File>
<File
@@ -3585,7 +3585,7 @@
Filter="asm"
>
<File
- RelativePath=".\..\src\win64.asm"
+ RelativePath=".\..\src\os\windows\win64.asm"
>
<FileConfiguration
Name="Release|Win32"
diff --git a/projects/openttd_vs80.vcproj.in b/projects/openttd_vs80.vcproj.in
index 80f363110..566dc0c3e 100644
--- a/projects/openttd_vs80.vcproj.in
+++ b/projects/openttd_vs80.vcproj.in
@@ -16,7 +16,7 @@
</Platforms>
<ToolFiles>
<ToolFile
- RelativePath="..\src\masm64.rules"
+ RelativePath="..\src\os\windows\masm64.rules"
/>
</ToolFiles>
<Configurations>
@@ -458,7 +458,7 @@
Filter="asm"
>
<File
- RelativePath=".\..\src\win64.asm"
+ RelativePath=".\..\src\os\windows\win64.asm"
>
<FileConfiguration
Name="Release|Win32"
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index b74e04810..310bc574e 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -17,7 +17,7 @@
</Platforms>
<ToolFiles>
<ToolFile
- RelativePath="..\src\masm64.rules"
+ RelativePath="..\src\os\windows\masm64.rules"
/>
</ToolFiles>
<Configurations>
@@ -649,7 +649,7 @@
>
</File>
<File
- RelativePath=".\..\src\ottdres.rc"
+ RelativePath=".\..\src\os\windows\ottdres.rc"
>
</File>
<File
@@ -761,7 +761,7 @@
>
</File>
<File
- RelativePath=".\..\src\win32.cpp"
+ RelativePath=".\..\src\os\windows\win32.cpp"
>
</File>
<File
@@ -1621,7 +1621,7 @@
>
</File>
<File
- RelativePath=".\..\src\win32.h"
+ RelativePath=".\..\src\os\windows\win32.h"
>
</File>
<File
@@ -3582,7 +3582,7 @@
Filter="asm"
>
<File
- RelativePath=".\..\src\win64.asm"
+ RelativePath=".\..\src\os\windows\win64.asm"
>
<FileConfiguration
Name="Release|Win32"
diff --git a/projects/openttd_vs90.vcproj.in b/projects/openttd_vs90.vcproj.in
index bc47bbd9f..d4f3214b1 100644
--- a/projects/openttd_vs90.vcproj.in
+++ b/projects/openttd_vs90.vcproj.in
@@ -17,7 +17,7 @@
</Platforms>
<ToolFiles>
<ToolFile
- RelativePath="..\src\masm64.rules"
+ RelativePath="..\src\os\windows\masm64.rules"
/>
</ToolFiles>
<Configurations>
@@ -455,7 +455,7 @@
Filter="asm"
>
<File
- RelativePath=".\..\src\win64.asm"
+ RelativePath=".\..\src\os\windows\win64.asm"
>
<FileConfiguration
Name="Release|Win32"
diff --git a/source.list b/source.list
index 21c6d556b..03186c07d 100644
--- a/source.list
+++ b/source.list
@@ -49,10 +49,10 @@ npf.cpp
openttd.cpp
os_timer.cpp
#if WIN32
- ottdres.rc
+ os/windows/ottdres.rc
#end
#if WINCE
- ottdres.rc
+ os/windows/ottdres.rc
#end
pathfind.cpp
pbs.cpp
@@ -97,12 +97,12 @@ tile_map.cpp
#if WIN32
#else
#if WINCE
- win32.cpp
+ os/windows/win32.cpp
#else
#if OS2
- os2.cpp
+ os/os2/os2.cpp
#else
- unix.cpp
+ os/unix/unix.cpp
#end
#end
#end
@@ -112,7 +112,7 @@ viewport.cpp
waypoint.cpp
widget.cpp
#if WIN32
- win32.cpp
+ os/windows/win32.cpp
#end
window.cpp
@@ -334,7 +334,7 @@ water.h
waypoint_base.h
waypoint_func.h
widget_type.h
-win32.h
+os/windows/win32.h
music/win32_m.h
sound/win32_s.h
video/win32_v.h
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"
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-23 08:46:44 +0000