BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-04 00:36:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove luasocket again

Browse Source
This commit is contained in:
Lion Kortlepel 2021-07-29 12:11:43 +02:00
parent dae52a71fd
commit 0faa46d48c
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -13,6 +13,3 @@
[submodule "include/toml11"] [submodule "include/toml11"]
path = include/toml11 path = include/toml11
url = https://github.com/ToruNiina/toml11 url = https://github.com/ToruNiina/toml11
[submodule "lib/luasocket"]
path = lib/luasocket
url = https://github.com/diegonehab/luasocket

7
CMakeLists.txt
View File

@ -25,6 +25,8 @@ include_directories("rapidjson/include")
include_directories("websocketpp") include_directories("websocketpp")
add_subdirectory("socket.io-client-cpp") add_subdirectory("socket.io-client-cpp")
add_subdirectory("include/commandline") add_subdirectory("include/commandline")
# builds all libraries that don't have cmakelists
add_subdirectory("lib")
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
@ -46,7 +48,6 @@ add_executable(BeamMP-Server
include/TResourceManager.h src/TResourceManager.cpp include/TResourceManager.h src/TResourceManager.cpp
include/THeartbeatThread.h src/THeartbeatThread.cpp include/THeartbeatThread.h src/THeartbeatThread.cpp
include/Http.h src/Http.cpp include/Http.h src/Http.cpp
#include/SocketIO.h src/SocketIO.cpp
include/TPPSMonitor.h src/TPPSMonitor.cpp include/TPPSMonitor.h src/TPPSMonitor.cpp
include/TNetwork.h src/TNetwork.cpp) include/TNetwork.h src/TNetwork.cpp)
@ -58,11 +59,11 @@ target_include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${LUA_INCL
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
if (UNIX) if (UNIX)
target_link_libraries(BeamMP-Server z pthread stdc++fs ${LUA_LIBRARIES} crypto ${OPENSSL_LIBRARIES} commandline sioclient_tls) target_link_libraries(BeamMP-Server z pthread stdc++fs ${LUA_LIBRARIES} crypto ${OPENSSL_LIBRARIES} commandline sioclient_tls luasocket)
elseif (WIN32) elseif (WIN32)
include(FindLua) include(FindLua)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(RapidJSON CONFIG REQUIRED) find_package(RapidJSON CONFIG REQUIRED)
target_include_directories(BeamMP-Server PRIVATE ${RAPIDJSON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) target_include_directories(BeamMP-Server PRIVATE ${RAPIDJSON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
target_link_libraries(BeamMP-Server PRIVATE ws2_32 ZLIB::ZLIB ${LUA_LIBRARIES} ${OPENSSL_LIBRARIES} commandline sioclient_tls) target_link_libraries(BeamMP-Server PRIVATE ws2_32 ZLIB::ZLIB ${LUA_LIBRARIES} ${OPENSSL_LIBRARIES} commandline sioclient_tls luasocket)
endif () endif ()

5
lib/CMakeLists.txt
View File

@ -0,0 +1,5 @@
############# luasocket #############
#####################################

1
lib/luasocket

@ -1 +0,0 @@
Subproject commit 5b18e475f38fcf28429b1cc4b17baee3b9793a62