Skip to content

Commit b879c43

Browse files
committed
Revert using luabind.cmake. Use luajit for luabind. Part 2
1 parent 5d7e0dd commit b879c43

File tree

3 files changed

+4
-49
lines changed

3 files changed

+4
-49
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17")
77

88
add_definitions(-D_MT -D_CPPUNWIND -DPURE_DYNAMIC_CAST -DDECLARE_SPECIALIZATION -DM_NOSTDCONTAINERS_EXT -DUSE_OGL)
99

10-
find_package(Lua51 REQUIRED)
10+
set(LUA_INCLUDE_DIR Externals/luajit/src)
11+
set(LUA_LIBRARIES luajit)
12+
set(LUA_FOUND 1)
1113
if (NOT WIN32)
1214
find_package(OpenSSL REQUIRED)
1315
find_package(Theora REQUIRED)

Externals/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
add_subdirectory(luajit)
2-
include(luabind.cmake)
3-
#add_subdirectory(luabind)
2+
add_subdirectory(luabind)
43
add_subdirectory(lzo)
54
add_subdirectory(cximage)
65
add_subdirectory(NVTT)

Externals/luabind.cmake

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)