mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-24 21:57:44 +00:00
Code Activity

maybe travis will use boost1.63

Browse source
This commit is contained in:
GokuWeedLord 2017-12-14 17:02:30 +11:00
parent 6ff62d4a3a
commit ec3e43fb09
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.travis.yml
View file

@ -29,8 +29,9 @@ cache:
before_install: before_install:
- eval "${MATRIX_EVAL}" - eval "${MATRIX_EVAL}"
- gem install --no-ri --no-rdoc mtime_cache - gem install --no-ri --no-rdoc mtime_cache
- sudo add-apt-repository ppa:rexut/recoil
- sudo apt-get update - sudo apt-get update
- sudo apt-get install -y libboost-dev libboost-all-dev - sudo apt-get install -y libboost1.63-dev libboost1.63-all-dev
- sudo apt-get install -y libmysqlclient-dev libmysqlcppconn-dev - sudo apt-get install -y libmysqlclient-dev libmysqlcppconn-dev
# Build steps # Build steps
@ -39,6 +40,6 @@ script:
- mtime_cache src/**/*.{%{cpp}} -c .mtime_cache/cache.json - mtime_cache src/**/*.{%{cpp}} -c .mtime_cache/cache.json
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake .. -DSAPPHIRE_BOOST_VER="1.54.0" && make -j 3 - cmake .. -DSAPPHIRE_BOOST_VER="1.63.0" && make -j 3
- cd .. - cd ..
- bash sql_import.sh - bash sql_import.sh

4
CMakeLists.txt
View file

@ -11,10 +11,6 @@ set(EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
if(UNIX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lstdc++fs")
endif()
########################################################################## ##########################################################################
# Boost stuff # Boost stuff

4
src/servers/Server_Zone/Script/ScriptLoader.cpp
View file

@ -6,12 +6,12 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <experimental/filesystem> #include <boost/filesystem.hpp>
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;
namespace fs = std::experimental::filesystem; namespace fs = boost::filesystem;
Core::Scripting::ScriptLoader::ScriptLoader() Core::Scripting::ScriptLoader::ScriptLoader()
{} {}