#182 - Renamed targets to be less ambigious

scripts/native/CMakeLists.txt

@@ -5,7 +5,7 @@ file(GLOB SCRIPT_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 file(GLOB_RECURSE SCRIPT_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 
 include_directories("${CMAKE_SOURCE_DIR}/src/servers/")
-include_directories("${CMAKE_SOURCE_DIR}/src/servers/Server_Zone/")
+include_directories("${CMAKE_SOURCE_DIR}/src/servers/sapphire_zone/")
 
 if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Yc${CMAKE_CURRENT_SOURCE_DIR}/ScriptObject.h /FI${CMAKE_CURRENT_SOURCE_DIR}/ScriptObject.h")
@@ -37,11 +37,11 @@ foreach(_sourcefile ${SCRIPT_FILES})
         )
     endif()
 
-    target_link_libraries("${_file}" server_zone)
+    target_link_libraries("${_file}" sapphire_zone)
 
     add_custom_command(TARGET "${_file}" POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/${_file}.exp"
         COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/${_file}.lib"
         COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/${_file}.ilk"
     )
-endforeach(_sourcefile ${SCRIPT_FILES})
+endforeach(_sourcefile ${SCRIPT_FILES})

src/common/Version.cpp

@@ -3,7 +3,7 @@
 namespace Core { 
     namespace Version {
 
-    const std::string GIT_HASH = "4606e83d151f02fa17e98e832c01b3680987b5f5";
+    const std::string GIT_HASH = "232d9cd1addda0a363375b86054cc479fc69b2ef";
     const std::string VERSION = "-128-NOTFOUND";
 
    } /* Version */

src/servers/CMakeLists.txt

@@ -9,6 +9,6 @@ set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
 include_directories("${PROJECT_INCLUDE_DIR}")
 include_directories("${PROJECT_SOURCE_DIR}")
 
-add_subdirectory(${PROJECT_SOURCE_DIR}/Server_Lobby)
-add_subdirectory(${PROJECT_SOURCE_DIR}/Server_REST)
-add_subdirectory(${PROJECT_SOURCE_DIR}/Server_Zone)
+add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_lobby)
+add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_api)
+add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_zone)

src/servers/sapphire_api/CMakeLists.txt

@@ -6,10 +6,10 @@ 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(server_rest ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
-add_dependencies(server_rest common xivdat)
+add_executable(sapphire_api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
+add_dependencies(sapphire_api common xivdat)
 
-set_target_properties(server_rest PROPERTIES
+set_target_properties(sapphire_api PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
@@ -21,13 +21,13 @@ set_target_properties(server_rest PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries (server_rest common xivdat pthread mysqlclient mysqlConnector dl z)
+  target_link_libraries (sapphire_api common xivdat pthread mysqlclient mysqlConnector dl z)
 else()
   # ignore unchecked iterators warnings from msvc
   add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 
-  target_link_libraries (server_rest common xivdat libmysql mysqlConnector zlib1)
+  target_link_libraries (sapphire_api common xivdat libmysql mysqlConnector zlib1)
 
 endif()
 
-target_link_libraries( server_rest ${Boost_LIBRARIES} ${Boost_LIBRARIES} )
+target_link_libraries( sapphire_api ${Boost_LIBRARIES} ${Boost_LIBRARIES} )

src/servers/sapphire_lobby/CMakeLists.txt

@@ -7,10 +7,10 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 
-add_executable(server_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
-add_dependencies(server_lobby common xivdat)
+add_executable(sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
+add_dependencies(sapphire_lobby common xivdat)
 
-set_target_properties(server_lobby PROPERTIES
+set_target_properties(sapphire_lobby PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
@@ -22,9 +22,9 @@ set_target_properties(server_lobby PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries(server_lobby common xivdat pthread mysqlclient mysqlConnector dl z)
+  target_link_libraries(sapphire_lobby common xivdat pthread mysqlclient mysqlConnector dl z)
 else()
-  target_link_libraries(server_lobby common xivdat libmysql mysqlConnector zlib1)
+  target_link_libraries(sapphire_lobby common xivdat libmysql mysqlConnector zlib1)
 endif()
 
-target_link_libraries(server_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})
+target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})

src/servers/sapphire_zone/Actor/PlayerQuest.cpp

@@ -8,9 +8,9 @@
 
 #include "Network/PacketWrappers/QuestMessagePacket.h"
 
-#include "Server_Zone/Session.h"
+#include "Session.h"
+#include "Inventory/Inventory.h"
 #include "Player.h"
-#include "Server_Zone/Inventory/Inventory.h"
 
 extern Core::Data::ExdData g_exdData;
 

src/servers/sapphire_zone/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 cmake_policy(SET CMP0014 OLD)
 
-project(Sapphire_Zone)
+project(sapphire_zone)
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
 
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -39,10 +39,10 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 
-add_executable(server_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
-add_dependencies(server_zone common xivdat mysqlConnector )
+add_executable(sapphire_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
+add_dependencies(sapphire_zone common xivdat mysqlConnector )
 
-set_target_properties(server_zone PROPERTIES
+set_target_properties(sapphire_zone PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
@@ -56,9 +56,9 @@ set_target_properties(server_zone PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries ( server_zone common xivdat pthread mysqlclient mysqlConnector dl z )
+  target_link_libraries ( sapphire_zone common xivdat pthread mysqlclient mysqlConnector dl z )
 else()
-  target_link_libraries ( server_zone common xivdat libmysql zlib1 mysqlConnector )
+  target_link_libraries ( sapphire_zone common xivdat libmysql zlib1 mysqlConnector )
 endif()
 
-target_link_libraries(server_zone ${Boost_LIBRARIES} )
+target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )