eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-23 00:29:19 +02:00
Code Issues 123 Wiki Activity

fix source list, break elseif chain because msvc is dumb

Browse Source
This commit is contained in:
milek7
2020-10-19 00:06:48 +02:00
parent c953ece94a
commit 47d8a7c541
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -184,6 +184,8 @@ set(SOURCES
"launcher/keymapper.cpp" "launcher/keymapper.cpp"
"launcher/textures_scanner.cpp" "launcher/textures_scanner.cpp"
"launcher/scenery_scanner.cpp" "launcher/scenery_scanner.cpp"
"vr/vr_interface.cpp"
) )
if (USE_IMGUI_GL3) if (USE_IMGUI_GL3)
@@ -205,7 +207,7 @@ endif()
if (WITH_OPENVR) if (WITH_OPENVR)
add_definitions(-DWITH_OPENVR) add_definitions(-DWITH_OPENVR)
set(SOURCES ${SOURCES} "vr/openvr_imp.cpp" "vr/vr_interface.cpp") set(SOURCES ${SOURCES} "vr/openvr_imp.cpp")
endif() endif()
if (WITH_OPENGL_MODERN) if (WITH_OPENGL_MODERN)

2
Globals.cpp
View File

@@ -727,7 +727,7 @@ global_settings::ConfigParse(cParser &Parser) {
Parser >> Global.motiontelemetry_conf.latposbased; Parser >> Global.motiontelemetry_conf.latposbased;
Parser >> Global.motiontelemetry_conf.axlebumpscale; Parser >> Global.motiontelemetry_conf.axlebumpscale;
} }
else if (token == "screenshotsdir") if (token == "screenshotsdir")
{ {
Parser.getTokens(1); Parser.getTokens(1);
Parser >> Global.screenshot_dir; Parser >> Global.screenshot_dir;