Skip to content

Commit 2fdd39f

Browse files
committed
Use exprtk lib to evaluate mathematical expressions
1 parent fe1ddc3 commit 2fdd39f

File tree

6 files changed

+41077
-316
lines changed

6 files changed

+41077
-316
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,8 @@ target_include_directories(
343343
${LIB_NAME}
344344
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include"
345345
"${CMAKE_CURRENT_SOURCE_DIR}/deps/websocketpp"
346-
"${CMAKE_CURRENT_SOURCE_DIR}/deps/obs-websocket/lib")
346+
"${CMAKE_CURRENT_SOURCE_DIR}/deps/obs-websocket/lib"
347+
"${CMAKE_CURRENT_SOURCE_DIR}/deps/exprtk")
347348

348349
# --- End of section ---
349350

@@ -354,7 +355,8 @@ if(OS_WINDOWS)
354355

355356
target_compile_definitions(${LIB_NAME} PRIVATE UNICODE _UNICODE)
356357
if(MSVC)
357-
target_compile_options(${LIB_NAME} PUBLIC /MP /d2FH4- /wd4267 /wd4267)
358+
target_compile_options(${LIB_NAME} PUBLIC /MP /d2FH4- /wd4267 /wd4267
359+
/bigobj)
358360
endif()
359361
target_sources(${LIB_NAME} PRIVATE src/win/advanced-scene-switcher-win.cpp)
360362
add_definitions(-D_WEBSOCKETPP_CPP11_STL_)

data/locale/en-US.ini

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -943,10 +943,7 @@ AdvSceneSwitcher.process.addArgumentDescription="Add new argument:"
943943
AdvSceneSwitcher.process.entry="Run{{filePath}}{{advancedSettings}}"
944944
AdvSceneSwitcher.process.entry.workingDirectory="Working directory:{{workingDirectory}}"
945945

946-
AdvSceneSwitcher.math.notANumber="not a valid number"
947-
AdvSceneSwitcher.math.expressionFail="failed evaluate expression"
948-
AdvSceneSwitcher.math.expressionFailParentheses="failed evaluate expression (missing Parentheses?)"
949-
AdvSceneSwitcher.math.notFullyResolved="not all operands were used"
946+
AdvSceneSwitcher.math.expressionFail="Failed evaluate expression"
950947

951948
AdvSceneSwitcher.selectScene="--select scene--"
952949
AdvSceneSwitcher.selectPreviousScene="Previous Scene"

0 commit comments

Comments
 (0)