From 47d8a7c5417b3e165b29fc13116e18a38a79e5fe Mon Sep 17 00:00:00 2001 From: milek7 Date: Mon, 19 Oct 2020 00:06:48 +0200 Subject: [PATCH] fix source list, break elseif chain because msvc is dumb --- CMakeLists.txt | 4 +++- Globals.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1afff351..982937dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,6 +184,8 @@ set(SOURCES "launcher/keymapper.cpp" "launcher/textures_scanner.cpp" "launcher/scenery_scanner.cpp" + +"vr/vr_interface.cpp" ) if (USE_IMGUI_GL3) @@ -205,7 +207,7 @@ endif() if (WITH_OPENVR) add_definitions(-DWITH_OPENVR) - set(SOURCES ${SOURCES} "vr/openvr_imp.cpp" "vr/vr_interface.cpp") + set(SOURCES ${SOURCES} "vr/openvr_imp.cpp") endif() if (WITH_OPENGL_MODERN) diff --git a/Globals.cpp b/Globals.cpp index d419743a..2a0d1067 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -727,7 +727,7 @@ global_settings::ConfigParse(cParser &Parser) { Parser >> Global.motiontelemetry_conf.latposbased; Parser >> Global.motiontelemetry_conf.axlebumpscale; } - else if (token == "screenshotsdir") + if (token == "screenshotsdir") { Parser.getTokens(1); Parser >> Global.screenshot_dir;