Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake

src/os/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_subdirectory(macosx)
+add_subdirectory(os2)
+add_subdirectory(unix)
+add_subdirectory(windows)

src/os/macosx/CMakeLists.txt

@@ -0,0 +1,11 @@
+add_files(
+    crashlog_osx.cpp
+    macos.h
+    macos.mm
+    osx_stdafx.h
+    splash.cpp
+    splash.h
+    string_osx.cpp
+    string_osx.h
+    CONDITION APPLE
+)

src/os/os2/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_files(
+    os2.cpp
+    CONDITION OPTION_OS2
+)

src/os/unix/CMakeLists.txt

@@ -0,0 +1,9 @@
+add_files(
+    crashlog_unix.cpp
+    CONDITION UNIX AND NOT APPLE AND NOT OPTION_OS2
+)
+
+add_files(
+    unix.cpp
+    CONDITION UNIX AND NOT OPTION_OS2
+)

src/os/windows/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_files(
+    crashlog_win.cpp
+    string_uniscribe.cpp
+    string_uniscribe.h
+    win32.cpp
+    win32.h
+    CONDITION WIN32
+)

src/os/windows/ottdres.rc.in

@@ -37,7 +37,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-100                     ICON    DISCARDABLE     "../../../media/openttd.ico"
+100                     ICON    DISCARDABLE     "${CMAKE_SOURCE_DIR}/os/windows/openttd.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -77,8 +77,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,11,0,!!ISODATE!!
- PRODUCTVERSION 1,11,0,!!ISODATE!!
+ FILEVERSION 1,11,0,${REV_ISODATE}
+ PRODUCTVERSION 1,11,0,${REV_ISODATE}
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -96,14 +96,14 @@ BEGIN
             VALUE "Comments", "This program is licensed under the GNU General Public License version 2.\0"
             VALUE "CompanyName", "OpenTTD Development Team\0"
             VALUE "FileDescription", "OpenTTD\0"
-            VALUE "FileVersion", "!!VERSION!!\0"
+            VALUE "FileVersion", "${REV_VERSION}\0"
             VALUE "InternalName", "openttd\0"
-            VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-!!YEAR!!. All Rights Reserved.\0"
+            VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-${REV_YEAR}. All Rights Reserved.\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "openttd.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "OpenTTD\0"
-            VALUE "ProductVersion", "!!VERSION!!\0"
+            VALUE "ProductVersion", "${REV_VERSION}\0"
             VALUE "SpecialBuild", "-\0"
         END
     END
@@ -116,7 +116,7 @@ END
 #endif    // !_MAC
 
 #ifdef __MINGW32__
-1 24 "../../../projects/dpi_aware.manifest"
+1 24 "${CMAKE_SOURCE_DIR}/os/windows/openttd.manifest"
 #endif
 
 #endif    // Neutral (Default) resources

src/os/windows/string_uniscribe.cpp

@@ -7,8 +7,6 @@
 
 /** @file string_uniscribe.cpp Functions related to laying out text on Win32. */
 
-#if defined(WITH_UNISCRIBE)
-
 #include "../../stdafx.h"
 #include "../../debug.h"
 #include "string_uniscribe.h"
@@ -620,5 +618,3 @@ const int *UniscribeParagraphLayout::UniscribeVisualRun::GetGlyphToCharMap() con
 
 	return this->utf16_to_utf8[this->cur_pos];
 }
-
-#endif /* defined(WITH_UNISCRIBE) */

src/os/windows/string_uniscribe.h

@@ -10,8 +10,6 @@
 #ifndef STRING_UNISCRIBE_H
 #define STRING_UNISCRIBE_H
 
-#if defined(WITH_UNISCRIBE)
-
 #include "../../gfx_layout.h"
 #include "../../string_base.h"
 #include <vector>
@@ -85,6 +83,4 @@ public:
 	size_t Prev(IterType what) override;
 };
 
-#endif /* defined(WITH_UNISCRIBE) */
-
 #endif /* STRING_UNISCRIBE_H */