Skip to content
Snippets Groups Projects
Commit d6d2c4fa authored by Jonathan Lambrechts's avatar Jonathan Lambrechts
Browse files

remove gmshlua, integrate lua in gmsh (run "gmsh test.lua -")

parent 9db76cec
No related branches found
No related tags found
No related merge requests found
...@@ -1004,6 +1004,3 @@ message("") ...@@ -1004,6 +1004,3 @@ message("")
mark_as_advanced(BISON FLEX GMP_LIB GMSH_EXTRA_VERSION HDF5_LIB MAKEINFO mark_as_advanced(BISON FLEX GMP_LIB GMSH_EXTRA_VERSION HDF5_LIB MAKEINFO
MED_LIB OCC_INC SZ_LIB TAUCS_LIB LUA_LIB TEXI2PDF) MED_LIB OCC_INC SZ_LIB TAUCS_LIB LUA_LIB TEXI2PDF)
add_executable(gmshlua EXCLUDE_FROM_ALL Solver/dgMainLua.cpp ${GMSH_SRC})
target_link_libraries(gmshlua ${LINK_LIBRARIES})
...@@ -13,6 +13,7 @@ set(SRC ...@@ -13,6 +13,7 @@ set(SRC
OS.cpp OS.cpp
OpenFile.cpp OpenFile.cpp
CreateFile.cpp CreateFile.cpp
LuaBindings.cpp
VertexArray.cpp VertexArray.cpp
SmoothData.cpp SmoothData.cpp
Octree.cpp Octree.cpp
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "OS.h" #include "OS.h"
#include "StringUtils.h" #include "StringUtils.h"
#include "GeomMeshMatcher.h" #include "GeomMeshMatcher.h"
#include "LuaBindings.h"
#if defined(HAVE_PARSER) #if defined(HAVE_PARSER)
#include "Parser.h" #include "Parser.h"
...@@ -328,6 +329,11 @@ int MergeFile(std::string fileName, bool warnIfMissing) ...@@ -328,6 +329,11 @@ int MergeFile(std::string fileName, bool warnIfMissing)
status = read_png(fileName); status = read_png(fileName);
} }
#endif #endif
#endif
#if defined(HAVE_LUA)
else if(ext == ".lua" || ext == ".LUA") {
status = read_lua(fileName.c_str());
}
#endif #endif
else { else {
CTX::instance()->geom.draw = 1; CTX::instance()->geom.draw = 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment