diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt index 635a85635..c66d14768 100644 --- a/apps/openmw-mp/CMakeLists.txt +++ b/apps/openmw-mp/CMakeLists.txt @@ -38,7 +38,7 @@ option(BUILD_WITH_LUA "Enable Terra/Lua language" ON) if(BUILD_WITH_LUA) #set(Terra_ROOT ${CMAKE_SOURCE_DIR}/external/terra/) if(WIN32) - find_package(Lua REQUIRED) + find_package(Lua51 REQUIRED) else() find_package(Terra REQUIRED) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_TERRA") @@ -46,11 +46,11 @@ if(BUILD_WITH_LUA) set(LuaScript_Sources Script/LangLua/LangLua.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) 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) set(NativeScript_Sources @@ -110,7 +110,7 @@ target_link_libraries(tes3mp-server ${RakNet_LIBRARY} components ${Terra_LIBRARY} - ${Lua_LIBRARY} + ${LUA_LIBRARIES} ${Pawn_LIBRARY} ${Breakpad_Library} ) diff --git a/apps/openmw-mp/Script/LangLua/LangLua.hpp b/apps/openmw-mp/Script/LangLua/LangLua.hpp index 3c2db031a..8aecf1418 100644 --- a/apps/openmw-mp/Script/LangLua/LangLua.hpp +++ b/apps/openmw-mp/Script/LangLua/LangLua.hpp @@ -8,7 +8,7 @@ #ifdef ENABLE_TERRA #include #else -#include +#include "lua.hpp" #endif #include