eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix rc porecompilation

Browse Source
This commit is contained in:
Hirek
2025-05-05 20:20:29 +02:00
parent cc82af3375
commit 70b68a155b
3 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -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})

3
driveruipanels.cpp
View File

@@ -1447,7 +1447,7 @@ debug_panel::update_section_renderer( std::vector<text_line> &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<text_line> &Output ) {
else if (Global.GfxRenderer == "experimental")
{
textline += "NVRHI on ";
if (Global.)
}
else
{

60
eu07.rc → eu07.rc.in
View File

@@ -1,30 +1,30 @@
#include <windows.h>
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 <windows.h>
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