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

Some cmake cleanups

Browse source
This commit is contained in:
Mordred 2018-09-20 23:31:38 +02:00
parent c0f873dce1
commit 81eb149d8e
13 changed files with 24 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CMakeLists.txt
View file

@ -1,15 +1,14 @@
cmake_policy(SET CMP0014 NEW)
cmake_minimum_required(VERSION 3.0.2)
project (Sapphire)
cmake_policy( SET CMP0014 NEW )
cmake_minimum_required( VERSION 3.0.2 )
project( Sapphire )
set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin)
set( CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin )
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
set(EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin )
set( LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin )
set( EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin )
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 )
##########################################################################
# Boost stuff

12
src/servers/CMakeLists.txt
View file

@ -1,13 +1,5 @@
cmake_minimum_required(VERSION 2.6)
project (Sapphire)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
include_directories("${PROJECT_INCLUDE_DIR}")
include_directories("${PROJECT_SOURCE_DIR}")
cmake_minimum_required( VERSION 3.0 )
project( Sapphire )
add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_lobby)
add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_api)

2
src/servers/Scripts/quest/ManFst001.cpp
View file

@ -1,7 +1,7 @@
#include <Actor/Player.h>
#include <sapphire_zone/Event/EventHandler.h>
#include <ScriptObject.h>
#include "Event/EventHelper.h"
#include "Event/EventHandler.h"
// Quest Script: ManFst001_00039
// Quest Name: Coming to Gridania

7
src/servers/Scripts/quest/ManFst002.cpp
View file

@ -1,7 +1,7 @@
#include <Actor/Player.h>
#include <sapphire_zone/Event/EventHandler.h>
#include "Event/EventHelper.h"
#include <ScriptObject.h>
#include "Event/EventHandler.h"
#include "Event/EventHelper.h"
// Quest Script: ManFst002_00124
// Quest Name: Close to Home
@ -9,8 +9,7 @@
// Start NPC: 1001140
// End NPC: 1000100
class ManFst002 :
public EventScript
class ManFst002 : public EventScript
{
private:

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

@ -5,7 +5,6 @@ project(Sapphire)
file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
add_executable(sapphire_api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
set_target_properties(sapphire_api PROPERTIES

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

@ -5,7 +5,6 @@ project(Sapphire)
file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
add_executable(sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})

2
src/servers/sapphire_zone/Action/ActionMount.cpp
View file

@ -3,11 +3,11 @@
#include <Util/UtilMath.h>
#include <Logging/Logger.h>
#include <Network/CommonActorControl.h>
#include <sapphire_zone/Network/PacketWrappers/EffectPacket.h>
#include "Network/PacketWrappers/ActorControlPacket142.h"
#include "Network/PacketWrappers/ActorControlPacket143.h"
#include "Network/PacketWrappers/ActorControlPacket144.h"
#include "Network/PacketWrappers/EffectPacket.h"
#include "Actor/Player.h"
#include "Script/ScriptMgr.h"

2
src/servers/sapphire_zone/Action/ActionTeleport.cpp
View file

@ -2,11 +2,11 @@
#include <Exd/ExdDataGenerated.h>
#include <Logging/Logger.h>
#include <Network/CommonActorControl.h>
#include <sapphire_zone/Network/PacketWrappers/EffectPacket.h>
#include <Util/UtilMath.h>
#include "Network/PacketWrappers/ActorControlPacket142.h"
#include "Network/PacketWrappers/ActorControlPacket143.h"
#include "Network/PacketWrappers/EffectPacket.h"
#include "Actor/Player.h"

2
src/servers/sapphire_zone/Actor/BNpc.cpp
View file

@ -4,7 +4,7 @@
#include <Exd/ExdDataGenerated.h>
#include <utility>
#include <Network/CommonActorControl.h>
#include <sapphire_zone/Network/PacketWrappers/EffectPacket.h>
#include <Network/PacketWrappers/EffectPacket.h>
#include "Forwards.h"
#include "Action/Action.h"

3
src/servers/sapphire_zone/Actor/Chara.cpp
View file

@ -4,7 +4,7 @@
#include <Exd/ExdDataGenerated.h>
#include <utility>
#include <Network/CommonActorControl.h>
#include <sapphire_zone/Network/PacketWrappers/EffectPacket.h>
#include "Forwards.h"
#include "Action/Action.h"
@ -16,6 +16,7 @@
#include "Network/PacketWrappers/ActorControlPacket143.h"
#include "Network/PacketWrappers/ActorControlPacket144.h"
#include "Network/PacketWrappers/UpdateHpMpTpPacket.h"
#include "Network/PacketWrappers/EffectPacket.h"
#include "StatusEffect/StatusEffect.h"
#include "Action/ActionCollision.h"

3
src/servers/sapphire_zone/Actor/Npc.cpp
View file

@ -4,7 +4,7 @@
#include <Exd/ExdDataGenerated.h>
#include <utility>
#include <Network/CommonActorControl.h>
#include <sapphire_zone/Network/PacketWrappers/EffectPacket.h>
#include "Forwards.h"
#include "Action/Action.h"
@ -16,6 +16,7 @@
#include "Network/PacketWrappers/ActorControlPacket143.h"
#include "Network/PacketWrappers/ActorControlPacket144.h"
#include "Network/PacketWrappers/UpdateHpMpTpPacket.h"
#include "Network/PacketWrappers/EffectPacket.h"
#include "StatusEffect/StatusEffect.h"
#include "Action/ActionCollision.h"

22
src/servers/sapphire_zone/CMakeLists.txt
View file

@ -4,22 +4,6 @@ cmake_policy(SET CMP0014 OLD)
project(sapphire_zone)
file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
/*.h
Actor/*.h
Action/*.h
DebugCommand/*.h
Event/*.h
Inventory/*.h
Linkshell/*.h
Math/*.h
Network/*.h
Network/Handlers/*.h
Network/PacketWrappers/*.h
Script/*.h
StatusEffect/*.h
Zone/*.h)
file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
*.c*
Actor/*.c*
@ -36,9 +20,7 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
StatusEffect/*.c*
Zone/*.c*)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
add_executable(sapphire_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
add_executable( sapphire_zone ${SERVER_SOURCE_FILES} )
set_target_properties(sapphire_zone PROPERTIES
CXX_STANDARD 14
@ -65,8 +47,8 @@ endif()
target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script" )
target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external" )
if (UNIX)
cotire( sapphire_zone )
endif()

2
src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
View file

@ -6,7 +6,6 @@
#include <Network/GamePacketNew.h>
#include <Network/PacketContainer.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <sapphire_zone/Event/EventHandler.h>
#include <Network/PacketDef/Zone/ClientZoneDef.h>
#include "Network/GameConnection.h"
@ -17,6 +16,7 @@
#include "Script/ScriptMgr.h"
#include "Event/EventHandler.h"
#include "Event/EventHelper.h"
#include "Zone/InstanceContent.h"