Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdParty
Submodule 3rdParty updated 1 files
+0 −7 CMakeLists.txt
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ add_subdirectory(3rdParty)
# Add project modules
add_subdirectory(include)
add_subdirectory(src/OMSimulatorLib)
add_subdirectory(src/OMSimulatorLua)
add_subdirectory(src/OMSimulatorPython)
add_subdirectory(src/OMSimulatorServer)
add_subdirectory(doc)
Expand Down
2 changes: 0 additions & 2 deletions src/OMSimulatorLib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ target_link_libraries(OMSimulatorLib
oms::3rd::fmi4c
oms::3rd::minizip
oms::3rd::zlib
oms::3rd::lua
oms::3rd::pugixml::header
oms::3rd::json::header
oms::3rd::ctpl::header)
Expand Down Expand Up @@ -134,7 +133,6 @@ target_link_libraries(OMSimulatorLib_static
oms::3rd::fmi4c
oms::3rd::minizip
oms::3rd::zlib
oms::3rd::lua
oms::3rd::pugixml::header
oms::3rd::json::header
oms::3rd::ctpl::header)
Expand Down
27 changes: 1 addition & 26 deletions src/OMSimulatorLib/OMSimulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@
#include <string>
#include <thread>

#if defined(OMS_STATIC)
extern "C"
{
#include "../OMSimulatorLua/OMSimulatorLua.c"
}
#endif

void oms_setLoggingCallback(void (*cb)(oms_message_type_enu_t type, const char* message))
{
Expand Down Expand Up @@ -1235,26 +1229,7 @@ oms_status_enu_t oms_RunFile(const char* filename)
}
else if (type == ".lua")
{
#if defined(OMS_STATIC)
lua_State *L = luaL_newstate();
luaL_openlibs(L);
luaopen_OMSimulatorLua(L);
if (luaL_loadfile(L, filename)) {
logError(lua_tostring(L, -1));
lua_close(L);
return oms_status_error;
}

if (lua_pcall(L, 0, 0, 0)) {
logError(lua_tostring(L, -1));
lua_close(L);
return oms_status_error;
}

lua_close(L);
#else
return logError("Lua is only supported in the static version of OMSimulatorLib");
#endif
return logError("Lua support is deprecated. Please use python scripts instead.");
}
else
return logError("Not able to process file '" + std::string(filename) + "'\nUse OMSimulator --help for more information.");
Expand Down
13 changes: 0 additions & 13 deletions src/OMSimulatorLua/CMakeLists.txt

This file was deleted.

Loading