mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 14:07:46 +00:00
Code Activity

Build fix... well ish...

Browse source
This commit is contained in:
Mordred 2018-03-06 23:20:07 +01:00
parent a489e9f576
commit 42a556b487
3 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -17,9 +17,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
# set(Boost_DEBUG 1) # set(Boost_DEBUG 1)
if( NOT SAPPHIRE_BOOST_VER ) if( NOT SAPPHIRE_BOOST_VER )
set(SAPPHIRE_BOOST_VER 1.60.0) set( SAPPHIRE_BOOST_VER 1.63.0 )
endif() endif()
set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0) set( SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0 )
########################################################################## ##########################################################################
# Common and library path # Common and library path
@ -37,8 +37,8 @@ include( "cmake/cotire.cmake" )
include( GetGitRevisionDescription ) include( GetGitRevisionDescription )
get_git_head_revision( GIT_REFSPEC GIT_SHA1 ) get_git_head_revision( GIT_REFSPEC GIT_SHA1 )
git_describe( VERSION --all --dirty=-d ) git_describe( VERSION --all --dirty=-d )
configure_file("src/common/Version.cpp.in" configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/src/common/Version.cpp.in"
"src/common/Version.cpp" @ONLY) "${CMAKE_CURRENT_SOURCE_DIR}/src/common/Version.cpp" @ONLY )
########################################################################## ##########################################################################
add_subdirectory( "src/libraries/sapphire/datReader" ) add_subdirectory( "src/libraries/sapphire/datReader" )

2
src/servers/sapphire_lobby/ServerLobby.cpp
View file

@ -16,6 +16,8 @@
#include "GameConnection.h" #include "GameConnection.h"
#include "RestConnector.h" #include "RestConnector.h"
#include "Forwards.h"
#include <Forwards.h>
#include <thread> #include <thread>
#include <boost/thread.hpp> #include <boost/thread.hpp>