File tree Expand file tree Collapse file tree 6 files changed +41077
-316
lines changed Expand file tree Collapse file tree 6 files changed +41077
-316
lines changed Original file line number Diff line number Diff line change @@ -343,7 +343,8 @@ target_include_directories(
343
343
${LIB_NAME}
344
344
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR} /deps/asio/asio/include"
345
345
"${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" )
347
348
348
349
# --- End of section ---
349
350
@@ -354,7 +355,8 @@ if(OS_WINDOWS)
354
355
355
356
target_compile_definitions (${LIB_NAME} PRIVATE UNICODE _UNICODE)
356
357
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)
358
360
endif ()
359
361
target_sources (${LIB_NAME} PRIVATE src/win/advanced -scene-switcher-win.cpp)
360
362
add_definitions (-D_WEBSOCKETPP_CPP11_STL_)
Original file line number Diff line number Diff line change @@ -943,10 +943,7 @@ AdvSceneSwitcher.process.addArgumentDescription="Add new argument:"
943
943
AdvSceneSwitcher.process.entry =" Run{{filePath}}{{advancedSettings}}"
944
944
AdvSceneSwitcher.process.entry.workingDirectory =" Working directory:{{workingDirectory}}"
945
945
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"
950
947
951
948
AdvSceneSwitcher.selectScene =" --select scene--"
952
949
AdvSceneSwitcher.selectPreviousScene =" Previous Scene"
You can’t perform that action at this time.
0 commit comments