18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-19 13:26:08 +01:00

Lua script screens beside the WebAssembly ones

This commit is contained in:
2026-11-10 15:29:25 +01:00
parent a73585dca0
commit c4924f756d
34 changed files with 3777 additions and 1635 deletions

View File

@@ -72,7 +72,7 @@ option(WITH_OPENGL_LEGACY "Compile with OpenGL legacy renderer" ON)
option(WITH_PYTHON "Python 3.14 embedded scripting" ON)
option(WITH_UART "Compile with libserialport" ON)
option(WITH_LUA "Compile with lua scripting support" ON)
option(WITH_WASM "WebAssembly screens (wasmscreen:, wasmdestinationsign:), run by the WAMR interpreter in ref/wamr" ON)
option(WITH_WASM "WebAssembly script screens (wasmscreen:, wasmdestinationsign:), run by the WAMR interpreter in ref/wamr" ON)
option(WITH_OPENVR "Compile with OpenVR" OFF)
option(WITH_ZMQ "Compile with cppzmq" OFF)
option(WITH_CRASHPAD "Compile with crashpad" OFF)
@@ -322,11 +322,14 @@ if (WITH_LUA)
set(SOURCES ${SOURCES} "scripting/lua.cpp")
endif()
# the script screens (scripting/scriptscreens.cpp), with the Lua and the WebAssembly runtime when they're built
set(SOURCES ${SOURCES} "scripting/scriptscreens.cpp")
if (WITH_LUA)
set(SOURCES ${SOURCES} "scripting/luaprogram.cpp")
endif()
if (WITH_WASM)
set(DEFINITIONS ${DEFINITIONS} "WITH_WASM")
set(SOURCES ${SOURCES} "scripting/wasmscreens.cpp")
else()
set(SOURCES ${SOURCES} "scripting/wasmscreensstub.cpp")
set(SOURCES ${SOURCES} "scripting/wasmprogram.cpp")
endif()
if (WITHDUMPGEN)
@@ -471,8 +474,9 @@ set(CORE_SOURCES
"utilities/parser.cpp"
"utilities/utilities.cpp"
"scripting/ladderlogic.cpp"
"scripting/wasmscreenrules.cpp"
"scripting/wasmscreenkernels.cpp"
"scripting/scriptscreenrules.cpp"
"scripting/scriptscreenkernels.cpp"
"scripting/scriptscreendrawing.cpp"
"simulation/simulationtestrules.cpp"
"vehicle/enginestart.cpp"
"vehicle/handover.cpp"