|
 |
1fe690d |
diff -up cantor-16.08.0/cmake/FindLuaJIT.cmake.than cantor-16.08.0/cmake/FindLuaJIT.cmake
|
|
|
1fe690d |
--- cantor-16.08.0/cmake/FindLuaJIT.cmake.than 2016-09-06 16:07:30.539296387 +0200
|
|
|
1fe690d |
+++ cantor-16.08.0/cmake/FindLuaJIT.cmake 2016-09-06 16:08:06.383945859 +0200
|
|
|
1fe690d |
@@ -1,6 +1,6 @@
|
|
Rex Dieter |
b835467 |
SET (LuaJIT_FOUND FALSE)
|
|
Rex Dieter |
b835467 |
SET (LUAJIT_LIBRARY_NAME luajit-5.1)
|
|
Rex Dieter |
b835467 |
-SET (LUAJIT_INCLUDE_DIRS /usr/include/luajit-2.0 /usr/local/include/luajit-2.0)
|
|
|
1fe690d |
+SET (LUAJIT_INCLUDE_DIRS /usr/include/luajit-2.1 /usr/local/include/luajit-2.1)
|
|
Rex Dieter |
b835467 |
|
|
Rex Dieter |
b835467 |
FIND_PATH (LUAJIT_INCLUDE_DIR lua.h ${LUAJIT_INCLUDE_DIRS} )
|
|
Rex Dieter |
b835467 |
FIND_LIBRARY (LUAJIT_LIBRARY NAMES ${LUAJIT_LIBRARY_NAME} PATHS ${CMAKE_LIBRARY_PATH})
|
|
|
1fe690d |
diff -up cantor-16.08.0/src/backends/lua/luaexpression.cpp.than cantor-16.08.0/src/backends/lua/luaexpression.cpp
|
|
|
1fe690d |
--- cantor-16.08.0/src/backends/lua/luaexpression.cpp.than 2016-09-06 16:22:52.745555302 +0200
|
|
|
1fe690d |
+++ cantor-16.08.0/src/backends/lua/luaexpression.cpp 2016-09-06 16:23:14.702728153 +0200
|
|
|
1fe690d |
@@ -26,7 +26,7 @@
|
|
|
1fe690d |
#include "imageresult.h"
|
|
|
1fe690d |
#include "helpresult.h"
|
|
|
1fe690d |
|
|
|
1fe690d |
-#include <luajit-2.0/lua.hpp> // need the luajit-2.0 prefix to avoid conflicts with Lua 5.2
|
|
|
1fe690d |
+#include <luajit-2.1/lua.hpp> // need the luajit-2.0 prefix to avoid conflicts with Lua 5.2
|
|
|
1fe690d |
|
|
|
1fe690d |
#include <QDebug>
|
|
|
1fe690d |
#include <QString>
|
|
|
1fe690d |
diff -up cantor-16.08.0/src/backends/lua/luahelper.cpp.than cantor-16.08.0/src/backends/lua/luahelper.cpp
|
|
|
1fe690d |
--- cantor-16.08.0/src/backends/lua/luahelper.cpp.than 2016-09-06 16:23:45.007586540 +0200
|
|
|
1fe690d |
+++ cantor-16.08.0/src/backends/lua/luahelper.cpp 2016-09-06 16:23:56.292161439 +0200
|
|
|
1fe690d |
@@ -20,7 +20,7 @@
|
|
|
1fe690d |
|
|
|
1fe690d |
#include "luahelper.h"
|
|
|
1fe690d |
|
|
|
1fe690d |
-#include <luajit-2.0/lua.hpp> // need the luajit-2.0 prefix to avoid conflicts with Lua 5.2
|
|
|
1fe690d |
+#include <luajit-2.1/lua.hpp> // need the luajit-2.0 prefix to avoid conflicts with Lua 5.2
|
|
|
1fe690d |
#include <QString>
|
|
|
1fe690d |
#include <QStringList>
|
|
|
1fe690d |
|
|
|
1fe690d |
diff -up cantor-16.08.0/src/backends/lua/luasession.h.than cantor-16.08.0/src/backends/lua/luasession.h
|
|
|
1fe690d |
--- cantor-16.08.0/src/backends/lua/luasession.h.than 2016-09-06 16:23:27.272254647 +0200
|
|
|
1fe690d |
+++ cantor-16.08.0/src/backends/lua/luasession.h 2016-09-06 16:23:36.916891324 +0200
|
|
|
1fe690d |
@@ -22,7 +22,7 @@
|
|
|
1fe690d |
#define _LUASESSION_H
|
|
|
1fe690d |
|
|
|
1fe690d |
#include "session.h"
|
|
|
1fe690d |
-#include <luajit-2.0/lua.hpp> // need the luajit-2.0 prefix to avoid conflicts with Lua 5.2
|
|
|
1fe690d |
+#include <luajit-2.1/lua.hpp> // need the luajit-2.0 prefix to avoid conflicts with Lua 5.2
|
|
|
1fe690d |
|
|
|
1fe690d |
class LuaExpression;
|
|
|
1fe690d |
|