swg-source/stationapi
1
0
Fork 0
mirror of https://github.com/SWG-Source/stationapi.git synced 2026-01-15 22:04:17 -05:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into install-targets

Browse Source 
# Conflicts:
#	CMakeLists.txt
This commit is contained in:
apathy
2017-01-06 23:41:54 -06:00
parent c12cf53aee 7b2c3a85c7
commit a3dd8ca898
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -1,4 +1,4 @@
# stationapi [![Build Status](https://travis-ci.com/apathyboy/stationapi.svg?token=FbjsTwsn9ctKssvZJqCa&branch=master)](https://travis-ci.com/apathyboy/stationapi) #
# stationapi [![Build Status](https://travis-ci.org/apathyboy/stationapi.svg?branch=master)](https://travis-ci.com/apathyboy/stationapi) #
A base library at the core of applications that implement chat and login functionality across galaxies.

7
cmake/ModernCpp.cmake
View File

@@ -1,8 +1,9 @@
if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=libc++")
if (NOT APPLE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++abi")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
if (APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=libc++")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
endif ()
elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")

1
src/stationapi/Node.hpp
View File

@@ -6,6 +6,7 @@
#include <algorithm>
#include <cstdint>
#include <memory>
#include <string>
#include <vector>
template <typename NodeT, typename ClientT>