mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 06:27:45 +00:00
Code Activity

More boost or... less boost.

Browse source
This commit is contained in:
mordred 2018-10-26 11:38:56 +02:00
parent 0ab4aba222
commit 26e8552cb0
4 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -10,23 +10,12 @@ set( EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin )
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake ) set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )
##########################################################################
# Boost stuff
# set(Boost_DEBUG 1)
if( NOT SAPPHIRE_BOOST_VER )
set( SAPPHIRE_BOOST_VER 1.63.0 )
endif()
set( SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0 )
########################################################################## ##########################################################################
# Common and library path # Common and library path
set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries" ) set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries" )
########################################################################## ##########################################################################
# Dependencies and compiler settings # Dependencies and compiler settings
include( "cmake/boost.cmake" )
include( "cmake/mysql.cmake" ) include( "cmake/mysql.cmake" )
include( "cmake/compiler.cmake" ) include( "cmake/compiler.cmake" )
include( "cmake/cotire.cmake" ) include( "cmake/cotire.cmake" )

1
src/servers/Scripts/CMakeLists.txt
View file

@ -39,7 +39,6 @@ foreach(_scriptDir ${children})
target_link_libraries( "script_${_name}" sapphire_zone ) target_link_libraries( "script_${_name}" sapphire_zone )
if(MSVC) if(MSVC)
#target_link_libraries( "script_${_name}" ${Boost_LIBRARIES})
set_target_properties( "script_${_name}" PROPERTIES set_target_properties( "script_${_name}" PROPERTIES
CXX_STANDARD 17 CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON CXX_STANDARD_REQUIRED ON

1
src/servers/sapphire_zone/ForwardsZone.h
View file

@ -4,6 +4,7 @@
#include <utility> #include <utility>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <functional>
#include "Common.h" #include "Common.h"
#define TYPE_FORWARD( x ) \ #define TYPE_FORWARD( x ) \

1
src/servers/sapphire_zone/Zone/CellHandler.h
View file

@ -1,5 +1,6 @@
#ifndef _CELLHANDLER_H #ifndef _CELLHANDLER_H
#define _CELLHANDLER_H #define _CELLHANDLER_H
#include <cassert>
#define TilesCount 32 #define TilesCount 32
#define TileSize 250.0f #define TileSize 250.0f