mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 02:57:45 +00:00
Code Activity

Link libsodium on linux

Browse source
This commit is contained in:
Minho Kang 2017-09-01 18:34:55 +09:00
parent a4914b903a
commit 6f7ec47014
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.travis.yml
View file

@ -2,21 +2,22 @@ language: c++
sudo: enabled sudo: enabled
before_install: before_install:
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo add-apt-repository ppa:chris-lea/libsodium -y
- sudo add-apt-repository universe - sudo add-apt-repository universe
- sudo apt-get update - sudo apt-get update
- sudo apt-get install -y software-properties-common - sudo apt-get install -y software-properties-common
- sudo apt-get update - sudo apt-get update
- sudo apt-get install gcc-4.9 g++-4.9 gcc-4.9-multilib g++-4.9-multilib cmake3 -y - sudo apt-get install gcc-4.9 g++-4.9 gcc-4.9-multilib g++-4.9-multilib cmake3 -y
- sudo apt-get install libboost-dev libboost-all-dev libmysqlclient-dev -y - sudo apt-get install libboost-dev libboost-all-dev libmysqlclient-dev -y
- sudo apt-get install libsodium-dev -y
compiler: compiler:
- gcc - gcc
# Build steps # Build steps
script: script:
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -DSAPPHIRE_BOOST_VER="1.54.0" -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_C_COMPILER=gcc-4.9 && make -j 3 - cmake .. -DSAPPHIRE_BOOST_VER="1.54.0" -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_C_COMPILER=gcc-4.9 && make -j 3
- cd .. - cd ..
- bash sql_import.sh - bash sql_import.sh

2
src/servers/Server_REST/CMakeLists.txt
View file

@ -92,7 +92,7 @@ set_target_properties(server_rest PROPERTIES
) )
if (UNIX) if (UNIX)
target_link_libraries (server_rest Common xivdat pthread mysqlclient dl z) target_link_libraries (server_rest Common xivdat pthread mysqlclient dl z sodium)
else() else()
target_link_libraries (server_rest Common xivdat libmysql zlib1 libsodium) target_link_libraries (server_rest Common xivdat libmysql zlib1 libsodium)
endif() endif()