SantaSpeen/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/SantaSpeen/BeamMP-Server.git synced 2026-06-18 16:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

add luasocket

Browse Source
This commit is contained in:
Lion Kortlepel
2021-07-29 12:18:01 +02:00
parent 0faa46d48c
commit 2a3bb1bef8
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+3
View File
@@ -13,3 +13,6 @@
[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-cmake"]
path = lib/luasocket-cmake
url = https://github.com/trevex/luasocket
CMakeLists.txt
+5 -4
View File
@@ -25,8 +25,9 @@ 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 # luasocket
add_subdirectory("lib") set(WANTS_BUILD_STATIC_LIBRARY ON)
add_subdirectory("lib/luasocket-cmake")
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
@@ -59,11 +60,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 luasocket) target_link_libraries(BeamMP-Server z pthread stdc++fs ${LUA_LIBRARIES} crypto ${OPENSSL_LIBRARIES} commandline sioclient_tls luasocket_library_static)
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 luasocket) target_link_libraries(BeamMP-Server PRIVATE ws2_32 ZLIB::ZLIB ${LUA_LIBRARIES} ${OPENSSL_LIBRARIES} commandline sioclient_tls luasocket_library_static)
endif () endif ()
lib/CMakeLists.txt
-5
View File
@@ -1,5 +0,0 @@
############# luasocket #############
#####################################
lib/luasocket-cmake
Submodule
+1
Submodule lib/luasocket-cmake added at 2cb3208cf3