mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 16:45:33 +00:00
Code Issues Releases Wiki Activity

Use default FindLua51 instead homebrew

Browse source
This commit is contained in:
Koncord 2017-01-03 19:12:34 +08:00
parent cbae39412a
commit dbbdb1071c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw-mp/CMakeLists.txt
View file

@ -38,7 +38,7 @@ option(BUILD_WITH_LUA "Enable Terra/Lua language" ON)
if(BUILD_WITH_LUA) if(BUILD_WITH_LUA)
#set(Terra_ROOT ${CMAKE_SOURCE_DIR}/external/terra/) #set(Terra_ROOT ${CMAKE_SOURCE_DIR}/external/terra/)
if(WIN32) if(WIN32)
find_package(Lua REQUIRED) find_package(Lua51 REQUIRED)
else() else()
find_package(Terra REQUIRED) find_package(Terra REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_TERRA") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_TERRA")
@ -46,11 +46,11 @@ if(BUILD_WITH_LUA)
set(LuaScript_Sources set(LuaScript_Sources
Script/LangLua/LangLua.cpp Script/LangLua/LangLua.cpp
Script/LangLua/LuaFunc.cpp) Script/LangLua/LuaFunc.cpp)
set(LuaScript_Headers ${Terra_INCLUDES} ${Lua_INCLUDES} ${CMAKE_SOURCE_DIR}/extern/LuaBridge ${CMAKE_SOURCE_DIR}/extern/LuaBridge/detail set(LuaScript_Headers ${Terra_INCLUDES} ${LUA_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/extern/LuaBridge ${CMAKE_SOURCE_DIR}/extern/LuaBridge/detail
Script/LangLua/LangLua.hpp) Script/LangLua/LangLua.hpp)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_LUA") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_LUA")
include_directories(${Terra_INCLUDES} ${Lua_INCLUDES} ${CMAKE_SOURCE_DIR}/extern/LuaBridge) include_directories(${Terra_INCLUDES} ${LUA_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/extern/LuaBridge)
endif(BUILD_WITH_LUA) endif(BUILD_WITH_LUA)
set(NativeScript_Sources set(NativeScript_Sources
@ -110,7 +110,7 @@ target_link_libraries(tes3mp-server
${RakNet_LIBRARY} ${RakNet_LIBRARY}
components components
${Terra_LIBRARY} ${Terra_LIBRARY}
${Lua_LIBRARY} ${LUA_LIBRARIES}
${Pawn_LIBRARY} ${Pawn_LIBRARY}
${Breakpad_Library} ${Breakpad_Library}
) )

2
apps/openmw-mp/Script/LangLua/LangLua.hpp
View file

@ -8,7 +8,7 @@
#ifdef ENABLE_TERRA #ifdef ENABLE_TERRA
#include <terra/terra.h> #include <terra/terra.h>
#else #else
#include <lua5.1/lua.hpp> #include "lua.hpp"
#endif #endif
#include <extern/LuaBridge/LuaBridge.h> #include <extern/LuaBridge/LuaBridge.h>