BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-08-16 16:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

compiles now on macos

Browse Source
This commit is contained in:
Maximilian Rehms 2024-05-18 15:06:26 +02:00
parent 5f9726f10f
commit 40e5496819
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -173,6 +173,11 @@ add_library(commandline_static
deps/commandline/src/backends/BufferedBackend.cpp deps/commandline/src/backends/BufferedBackend.cpp
deps/commandline/src/backends/BufferedBackend.h deps/commandline/src/backends/BufferedBackend.h
) )
# Ensure the commandline library uses C++11
set_target_properties(commandline_static PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED YES)
if (WIN32) if (WIN32)
target_compile_definitions(commandline_static PRIVATE -DPLATFORM_WINDOWS=1) target_compile_definitions(commandline_static PRIVATE -DPLATFORM_WINDOWS=1)
else () else ()
@ -217,3 +222,7 @@ if(${PROJECT_NAME}_ENABLE_UNIT_TESTING)
endif(MSVC) endif(MSVC)
endif() endif()
# Specific AppleClang options to suppress C++11 extension warnings - probably optional because it could hinder trouble shooting
if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
add_compile_options(-Wno-c++11-extensions)
endif ()

2
src/TLuaEngine.cpp
View File

@ -268,7 +268,7 @@ std::vector<std::string> TLuaEngine::StateThreadData::GetStateTableKeys(const st
for (size_t i = 0; i < keys.size(); ++i) { for (size_t i = 0; i < keys.size(); ++i) {
auto obj = current.get<sol::object>(keys.at(i)); auto obj = current.get<sol::object>(keys.at(i));
if (obj.get_type() == sol::type::nil) { if (obj.get_type() == sol::type::none) {
// error // error
break; break;
} else if (i == keys.size() - 1) { } else if (i == keys.size() - 1) {