diff --git a/CMakeLists.txt b/CMakeLists.txt index c727d057..59c2aeb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -365,10 +365,14 @@ endif() set(cppzmq_INCLUDE_DIR ${cppzmq_INCLUDE_DIR} "${DEPS_DIR}/cppzmq/include") set(GLM_INCLUDE_DIR ${GLM_INCLUDE_DIR} "${DEPS_DIR}/glm/") +# Process version.rc.in into version.rc +configure_file(${CMAKE_SOURCE_DIR}/eu07.rc.in + ${CMAKE_BINARY_DIR}/eu07.rc @ONLY) + if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) - set(SOURCES ${SOURCES} "eu07.rc") - set(SOURCES ${SOURCES} "eu07.ico") - add_compile_options("/utf-8") + set(SOURCES ${SOURCES} ${CMAKE_BINARY_DIR}/eu07.rc) + set(SOURCES ${SOURCES} eu07.ico) + add_compile_options("/utf-8") endif() add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS}) diff --git a/driveruipanels.cpp b/driveruipanels.cpp index 892f6434..ac6a5bcd 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -1447,7 +1447,7 @@ debug_panel::update_section_renderer( std::vector &Output ) { Output.emplace_back( textline, Global.UITextColor ); - std::string textline = "Rendering mode: "; + textline += "\nRendering mode: "; if (Global.GfxRenderer == "default") { @@ -1456,7 +1456,6 @@ debug_panel::update_section_renderer( std::vector &Output ) { else if (Global.GfxRenderer == "experimental") { textline += "NVRHI on "; - if (Global.) } else { diff --git a/eu07.rc b/eu07.rc.in similarity index 95% rename from eu07.rc rename to eu07.rc.in index 27b65d52..27c8dae0 100644 --- a/eu07.rc +++ b/eu07.rc.in @@ -1,30 +1,30 @@ -#include - -IDI_ICON1 ICON "eu07.ico" -GLFW_ICON ICON "eu07.ico" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0 - PRODUCTVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0 - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "eu07.pl\0" - VALUE "FileDescription", "Symulator pojazdów szynowych\0" - VALUE "FileVersion", "@VERSION_STRING@\0" - VALUE "ProductName", "MaSzyna\0" - VALUE "ProductVersion", "@VERSION_STRING@\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +#include + +IDI_ICON1 ICON "eu07.ico" +GLFW_ICON ICON "eu07.ico" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@ + PRODUCTVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@ + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "eu07.pl\0" + VALUE "FileDescription", "Symulator pojazdów szynowych\0" + VALUE "FileVersion", "@VERSION_STRING@\0" + VALUE "ProductName", "MaSzyna\0" + VALUE "ProductVersion", "@VERSION_STRING@\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END