diff --git a/Source/DasherVR/Private/Dasher3DWidget.cpp b/Source/DasherVR/Private/Dasher3DWidget.cpp index 163510ade75899c5633f5bfcd72b400b8cac4823..e7d90b6ab070cae427c66cb48056b2d9fa68666a 100644 --- a/Source/DasherVR/Private/Dasher3DWidget.cpp +++ b/Source/DasherVR/Private/Dasher3DWidget.cpp @@ -287,7 +287,8 @@ void ADasher3DWidget::SimulateClick(FKey Key, bool pressed) if(pressed) { DasherMainInterface->KeyDown(FDateTime::Now().GetSecond() + FDateTime::Now().GetMillisecond(), (Key == EKeys::LeftMouseButton) ? Dasher::Keys::Primary_Input : Dasher::Keys::Secondary_Input); - } else + } + else { DasherMainInterface->KeyUp(FDateTime::Now().GetSecond() + FDateTime::Now().GetMillisecond(), (Key == EKeys::LeftMouseButton) ? Dasher::Keys::Primary_Input : Dasher::Keys::Secondary_Input); } diff --git a/Source/Thirdparty/CMakeLists.txt b/Source/Thirdparty/CMakeLists.txt index 4d2f8bc7d3a4fadaa50b4a6126eb3a809e1390cf..b70e30dde9986563a60b45003375428c833ada40 100644 --- a/Source/Thirdparty/CMakeLists.txt +++ b/Source/Thirdparty/CMakeLists.txt @@ -30,7 +30,7 @@ if (UNIX) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_compile_definitions(HAVE_ROUND XML_STATIC _CRT_SECURE_NO_WARNINGS HAVE_OWN_FILEUTILS HAVE_OWN_FILELOGGER PUGIXML_NO_EXCEPTIONS) set(CMAKE_SUPPRESS_REGENERATION true) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++17 -nostdinc++ -I${LIBC_PATH}include/c++/v1 -L${LIBC_PATH}lib ${LIBC_PATH}lib") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++17 -nostdinc++ -fno-exceptions -I${LIBC_PATH}include/c++/v1 -L${LIBC_PATH}lib ${LIBC_PATH}lib") set(CMAKE_EXE_LINKER_FLAGS "-stdlib=libc++") diff --git a/Source/Thirdparty/Dasher/DasherCore b/Source/Thirdparty/Dasher/DasherCore index 0f0d1953f3ff1d4c20a1387d4bde2ede3b86f254..bf390871a24adb1b274e30bfd463cdbfddc3dbd0 160000 --- a/Source/Thirdparty/Dasher/DasherCore +++ b/Source/Thirdparty/Dasher/DasherCore @@ -1 +1 @@ -Subproject commit 0f0d1953f3ff1d4c20a1387d4bde2ede3b86f254 +Subproject commit bf390871a24adb1b274e30bfd463cdbfddc3dbd0 diff --git a/Source/Thirdparty/Dasher/Lib/DasherCore.a b/Source/Thirdparty/Dasher/Lib/DasherCore.a index 00410eed404cdbd6929169e1a7c3eedba2c9a311..5e3b9f4437788d247acc80ef079bcee06650d37f 100644 Binary files a/Source/Thirdparty/Dasher/Lib/DasherCore.a and b/Source/Thirdparty/Dasher/Lib/DasherCore.a differ