BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-23 00:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix various build warnings and errors with clang++

Browse Source
This commit is contained in:
Lion Kortlepel
2022-10-28 17:01:30 +02:00
parent c51d713969
commit a44f9b3dba
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -9,6 +9,9 @@ project(BeamMP-Server
HOMEPAGE_URL https://beammp.com HOMEPAGE_URL https://beammp.com
LANGUAGES CXX C) LANGUAGES CXX C)
# quality of life stuff
set(CMAKE_COLOR_DIAGNOSTICS ON)
find_package(Git REQUIRED) find_package(Git REQUIRED)
# Update submodules as needed # Update submodules as needed
option(GIT_SUBMODULE "Check submodules during build" ON) option(GIT_SUBMODULE "Check submodules during build" ON)
@@ -131,6 +134,7 @@ set(BeamMP_Includes
"${CMAKE_CURRENT_SOURCE_DIR}/deps/rapidjson/include" "${CMAKE_CURRENT_SOURCE_DIR}/deps/rapidjson/include"
"${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include" "${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include"
"${CMAKE_CURRENT_SOURCE_DIR}/deps" "${CMAKE_CURRENT_SOURCE_DIR}/deps"
"${CMAKE_CURRENT_SOURCE_DIR}/deps/fmt/include"
) )
set(BeamMP_Definitions set(BeamMP_Definitions
@@ -191,12 +195,12 @@ set(BeamMP_Libraries
OpenSSL::SSL OpenSSL::SSL
OpenSSL::Crypto OpenSSL::Crypto
sol2::sol2 sol2::sol2
fmt::fmt
Threads::Threads Threads::Threads
ZLIB::ZLIB ZLIB::ZLIB
${LUA_LIBRARIES} ${LUA_LIBRARIES}
commandline commandline
sentry sentry
fmt::fmt
) )
if (WIN32) if (WIN32)

4
include/TLuaEngine.h
View File

@@ -98,8 +98,8 @@ public:
return mLuaStates.size(); return mLuaStates.size();
} }
std::vector<std::string> GetLuaStateNames() { std::vector<std::string> GetLuaStateNames() {
std::vector<std::string> names{}; std::vector<std::string> names {};
for(auto const& [stateId, _ ] : mLuaStates) { for (auto const& [stateId, _] : mLuaStates) {
names.push_back(stateId); names.push_back(stateId);
} }
return names; return names;