eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00
Code Issues 121 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

8
CMakeLists.txt
View File

@@ -365,9 +365,13 @@ endif()
set(cppzmq_INCLUDE_DIR ${cppzmq_INCLUDE_DIR} "${DEPS_DIR}/cppzmq/include") set(cppzmq_INCLUDE_DIR ${cppzmq_INCLUDE_DIR} "${DEPS_DIR}/cppzmq/include")
set(GLM_INCLUDE_DIR ${GLM_INCLUDE_DIR} "${DEPS_DIR}/glm/") 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) if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
set(SOURCES ${SOURCES} "eu07.rc") set(SOURCES ${SOURCES} ${CMAKE_BINARY_DIR}/eu07.rc)
set(SOURCES ${SOURCES} "eu07.ico") set(SOURCES ${SOURCES} eu07.ico)
add_compile_options("/utf-8") add_compile_options("/utf-8")
endif() endif()

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 ); Output.emplace_back( textline, Global.UITextColor );
std::string textline = "Rendering mode: "; textline += "\nRendering mode: ";
if (Global.GfxRenderer == "default") if (Global.GfxRenderer == "default")
{ {
@@ -1456,7 +1456,6 @@ debug_panel::update_section_renderer( std::vector<text_line> &Output ) {
else if (Global.GfxRenderer == "experimental") else if (Global.GfxRenderer == "experimental")
{ {
textline += "NVRHI on "; textline += "NVRHI on ";
if (Global.)
} }
else else
{ {

4
eu07.rc → eu07.rc.in
View File

@@ -4,8 +4,8 @@ IDI_ICON1 ICON "eu07.ico"
GLFW_ICON ICON "eu07.ico" GLFW_ICON ICON "eu07.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0 FILEVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@
PRODUCTVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0 PRODUCTVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L FILEFLAGS 0x0L
FILEOS 0x40004L FILEOS 0x40004L