Fix lua imports, fix linux backspace behaviour in console

This commit is contained in:
Lion Kortlepel 2020-11-06 15:50:03 +01:00
parent e5a0d43024
commit 6bebc4c160
2 changed files with 7 additions and 2 deletions

View File

@ -25,7 +25,9 @@ add_executable(BeamMP-Server ${source_files})
target_include_directories(BeamMP-Server PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> ${Boost_INCLUDE_DIRS})
if (UNIX)
target_link_libraries(BeamMP-Server curl lua5.3 krb5 z pthread stdc++fs ${Boost_LINK_DIRS})
find_package(Lua 5.3 REQUIRED)
target_include_directories(BeamMP-Server PRIVATE ${LUA_INCLUDE_DIR})
target_link_libraries(BeamMP-Server curl krb5 z pthread stdc++fs ${Boost_LINK_DIRS} ${LUA_LIBRARIES})
elseif (WIN32)
include(FindLua)
find_package(CURL CONFIG REQUIRED)

View File

@ -116,14 +116,17 @@ void SetupConsole() {
HandleInput(CInputBuff);
CInputBuff.clear();
}
} else if (In == 8) {
} else if (In == 8 || In == 127) {
if (!CInputBuff.empty())
CInputBuff.pop_back();
} else if (In == 4) {
CInputBuff = "exit";
HandleInput(CInputBuff);
CInputBuff.clear();
} else if (!isprint(In)) {
// ignore
} else {
// info(std::to_string(In));
CInputBuff += char(In);
}
}