mirror of
https://github.com/SapphireServer/Sapphire.git
synced 2025-04-25 22:17:45 +00:00
More boost or... less boost.
This commit is contained in:
parent
0ab4aba222
commit
26e8552cb0
4 changed files with 2 additions and 12 deletions
|
@ -10,23 +10,12 @@ set( EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin )
|
|||
|
||||
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
|
||||
set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries" )
|
||||
|
||||
##########################################################################
|
||||
# Dependencies and compiler settings
|
||||
include( "cmake/boost.cmake" )
|
||||
include( "cmake/mysql.cmake" )
|
||||
include( "cmake/compiler.cmake" )
|
||||
include( "cmake/cotire.cmake" )
|
||||
|
|
|
@ -39,7 +39,6 @@ foreach(_scriptDir ${children})
|
|||
target_link_libraries( "script_${_name}" sapphire_zone )
|
||||
|
||||
if(MSVC)
|
||||
#target_link_libraries( "script_${_name}" ${Boost_LIBRARIES})
|
||||
set_target_properties( "script_${_name}" PROPERTIES
|
||||
CXX_STANDARD 17
|
||||
CXX_STANDARD_REQUIRED ON
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
#include <utility>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
#include <functional>
|
||||
#include "Common.h"
|
||||
|
||||
#define TYPE_FORWARD( x ) \
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#ifndef _CELLHANDLER_H
|
||||
#define _CELLHANDLER_H
|
||||
#include <cassert>
|
||||
|
||||
#define TilesCount 32
|
||||
#define TileSize 250.0f
|
||||
|
|
Loading…
Add table
Reference in a new issue