Update to 12.0-beta1

2021-08-15 14:57:29 +03:00
parent ac7d3eba75
commit 9df4f2c4fc
666 changed files with 61302 additions and 20466 deletions
--- a/cmake/scripts/FindVersion.cmake
+++ b/cmake/scripts/FindVersion.cmake
@@ -6,9 +6,6 @@ endif()
 if(NOT REV_MINOR)
    set(REV_MINOR 0)
 endif()
-if(NOT REV_BUILD)
-    set(REV_BUILD 0)
-endif()

 #
 # Finds the current version of the current folder.
@@ -138,7 +135,7 @@ else()
    configure_file("${CMAKE_SOURCE_DIR}/src/rev.cpp.in"
            "${FIND_VERSION_BINARY_DIR}/rev.cpp")

-    if(WIN32)
+    if(WINDOWS)
        message(STATUS "Generating ottdres.rc")
        configure_file("${CMAKE_SOURCE_DIR}/src/os/windows/ottdres.rc.in"
                "${FIND_VERSION_BINARY_DIR}/ottdres.rc")