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

Finish moving deps to deps/

Browse Source
This commit is contained in:
Lion Kortlepel 2021-09-16 00:22:33 +02:00
parent bb34378b8e
commit 8b69127cdd
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -20,12 +20,7 @@ elseif (UNIX)
endif () endif ()
# this has to happen before -DDEBUG since it wont compile properly with -DDEBUG # this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
include_directories("deps/asio/asio/include") add_subdirectory(deps)
include_directories("deps/rapidjson/include")
include_directories("deps/websocketpp")
add_subdirectory("deps/socket.io-client-cpp")
add_subdirectory("deps/commandline")
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
@ -50,8 +45,13 @@ add_executable(BeamMP-Server
include/TPPSMonitor.h src/TPPSMonitor.cpp include/TPPSMonitor.h src/TPPSMonitor.cpp
include/TNetwork.h src/TNetwork.cpp) include/TNetwork.h src/TNetwork.cpp)
target_include_directories(BeamMP-Server PRIVATE "${PROJECT_SOURCE_DIR}/deps/asio/asio/include")
target_include_directories(BeamMP-Server PRIVATE "${PROJECT_SOURCE_DIR}/deps/rapidjson/include")
target_include_directories(BeamMP-Server PRIVATE "${PROJECT_SOURCE_DIR}/deps/websocketpp")
target_include_directories(BeamMP-Server PRIVATE "${PROJECT_SOURCE_DIR}/deps/commandline")
target_include_directories(BeamMP-Server PRIVATE "${PROJECT_SOURCE_DIR}/deps")
target_include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${LUA_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${LUA_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
find_package(Lua REQUIRED) find_package(Lua REQUIRED)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)

2
deps/CMakeLists.txt vendored Normal file
View File

@ -0,0 +1,2 @@
add_subdirectory("${PROJECT_SOURCE_DIR}/deps/socket.io-client-cpp")
add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")

2
include/TConsole.h
View File

@ -1,9 +1,9 @@
#pragma once #pragma once
#include "commandline/commandline.h"
#include "TLuaFile.h" #include "TLuaFile.h"
#include <atomic> #include <atomic>
#include <fstream> #include <fstream>
#include "commandline.h"
class TConsole { class TConsole {
public: public: