Skip to content
Browse files

compiles after move

  • Loading branch information...
1 parent b87c855 commit 2bce8d654037a3f1c01a1556602d4870675fd645 @Kronos11 Kronos11 committed
Showing with 44 additions and 62 deletions.
  1. +1 −2 examples/datatable_reader/CMakeLists.txt
  2. +1 −2 examples/tre_archiver/CMakeLists.txt
  3. +1 −2 examples/tre_reader/CMakeLists.txt
  4. +1 −2 examples/tre_unpacker/CMakeLists.txt
  5. +0 −1 plugins/phpbb_auth/CMakeLists.txt
  6. +0 −1 plugins/smf_auth/CMakeLists.txt
  7. +0 −1 src/pub14_core/CMakeLists.txt
  8. +1 −1 src/pub14_core/combat/combat_data.h
  9. +1 −1 src/pub14_core/spawn/finite_state_machine.h
  10. +1 −1 src/pub14_core/spawn/fsm_manager.h
  11. +1 −1 src/pub14_core/spawn/fsm_state.h
  12. +1 −1 src/pub14_core/sui/sui_window.cc
  13. +2 −2 src/pub14_core/terrain/terrain_service.cc
  14. +7 −6 src/swganh/CMakeLists.txt
  15. +1 −2 src/swganh/app/CMakeLists.txt
  16. +1 −2 src/swganh/app/swganh_app.cc
  17. +1 −2 src/swganh/combat/CMakeLists.txt
  18. +1 −2 src/swganh/command/CMakeLists.txt
  19. +1 −2 src/swganh/equipment/CMakeLists.txt
  20. +1 −1 src/swganh/equipment/equipment_service_interface.h
  21. +1 −1 src/swganh/main.cc
  22. +1 −2 src/swganh/object/CMakeLists.txt
  23. +1 −1 src/swganh/object/container_interface.h
  24. +1 −2 src/swganh/simulation/CMakeLists.txt
  25. +1 −2 src/swganh/social/CMakeLists.txt
  26. +1 −1 src/swganh/spawn/spawn_service_interface.h
  27. +1 −2 src/swganh/sui/CMakeLists.txt
  28. +1 −1 src/swganh/sui/sui_service_interface.h
  29. +1 −2 src/swganh/terrain/CMakeLists.txt
  30. +1 −1 src/swganh/tre/config_reader.cc
  31. +1 −1 src/swganh/tre/iff/iff.h
  32. +1 −1 src/swganh/tre/visitors/snapshot/ws_visitor.cc
  33. +1 −1 src/swganh/tre/visitors/terrain/detail/header.h
  34. +1 −1 src/swganh/tre/visitors/terrain/detail/layer.h
  35. +1 −1 src/swganh/tre/visitors/terrain/detail/layer_loader.cc
  36. +1 −2 src/swganh/utilities/CMakeLists.txt
  37. +1 −1 src/swganh/utilities/glm_binding.cc
  38. +1 −2 src/swganh/weather/CMakeLists.txt
  39. +1 −1 tools/cmake/ANHExecutable.cmake
  40. +1 −1 tools/cmake/ANHLibrary.cmake
View
3 examples/datatable_reader/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHExecutable)
AddANHExecutable(datatable_reader
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
FOLDER
"examples"
ADDITIONAL_INCLUDE_DIRS
View
3 examples/tre_archiver/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHExecutable)
AddANHExecutable(tre_archiver
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
FOLDER
"examples"
ADDITIONAL_INCLUDE_DIRS
View
3 examples/tre_reader/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHExecutable)
AddANHExecutable(tre_reader
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
FOLDER
"examples"
ADDITIONAL_INCLUDE_DIRS
View
3 examples/tre_unpacker/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHExecutable)
AddANHExecutable(tre_unpacker
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
FOLDER
"examples"
ADDITIONAL_INCLUDE_DIRS
View
1 plugins/phpbb_auth/CMakeLists.txt
@@ -2,7 +2,6 @@ include(ANHPlugin)
AddANHPlugin(phpbb_auth
DEPENDS
- anh_lib
swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
View
1 plugins/smf_auth/CMakeLists.txt
@@ -2,7 +2,6 @@ include(ANHPlugin)
AddANHPlugin(smf_auth
DEPENDS
- anh_lib
swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
View
1 src/pub14_core/CMakeLists.txt
@@ -2,7 +2,6 @@ include(ANHPlugin)
AddANHPlugin(pub14_core
DEPENDS
- anh_lib
swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
View
2 src/pub14_core/combat/combat_data.h
@@ -9,7 +9,7 @@
#include <cstdint>
#include <unordered_map>
-#include <anh/hash_string.h>
+#include <swganh/hash_string.h>
#include "swganh/command/command_properties.h"
#include "swganh/scripting/utilities.h"
#include <boost/python.hpp>
View
2 src/pub14_core/spawn/finite_state_machine.h
@@ -1,7 +1,7 @@
#pragma once
#include <map>
-#include <anh/event_dispatcher.h>
+#include <swganh/event_dispatcher.h>
namespace swganh
{
View
2 src/pub14_core/spawn/fsm_manager.h
@@ -1,7 +1,7 @@
#pragma once
#include <map>
-#include <anh/event_dispatcher.h>
+#include <swganh/event_dispatcher.h>
#include "finite_state_machine.h"
View
2 src/pub14_core/spawn/fsm_state.h
@@ -1,7 +1,7 @@
#pragma once
#include <vector>
-#include <anh/event_dispatcher.h>
+#include <swganh/event_dispatcher.h>
namespace swganh
{
View
2 src/pub14_core/sui/sui_window.cc
@@ -1,4 +1,4 @@
-#include <anh/logger.h>
+#include <swganh/logger.h>
#include "sui_window.h"
#include <boost/algorithm/string.hpp>
View
4 src/pub14_core/terrain/terrain_service.cc
@@ -4,8 +4,8 @@
#include "pub14_core/simulation/scene_events.h"
-#include <anh/event_dispatcher.h>
-#include <anh/logger.h>
+#include <swganh/event_dispatcher.h>
+#include <swganh/logger.h>
#include "swganh/tre/resource_manager.h"
//#include "swganh/tre/visitors/terrain/layer_visitor.h"
View
13 src/swganh/CMakeLists.txt
@@ -30,12 +30,11 @@ set_target_properties(swgpy
PROPERTIES
FOLDER "cmake_targets"
)
-
include(ANHExecutable)
AddANHExecutable(swganh
- DEPENDS
- anh_lib
+ DEPENDS
+ swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
@@ -45,7 +44,7 @@ AddANHExecutable(swganh
${TBB_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
+ ${Boost_LIBRARY_DIRS}
DEBUG_LIBRARIES
${Boost_CHRONO_LIBRARY_DEBUG}
${Boost_DATE_TIME_LIBRARY_DEBUG}
@@ -57,7 +56,8 @@ AddANHExecutable(swganh
${Boost_REGEX_LIBRARY_DEBUG}
${Boost_SYSTEM_LIBRARY_DEBUG}
${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
+ ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_DEBUG}
+ ${MYSQL_LIBRARY_DEBUG}
${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
${PYTHON_LIBRARY}
${TBB_DEBUG_LIBRARIES}
@@ -73,9 +73,10 @@ AddANHExecutable(swganh
${Boost_REGEX_LIBRARY_RELEASE}
${Boost_SYSTEM_LIBRARY_RELEASE}
${Boost_THREAD_LIBRARY_RELEASE}
+ ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE}
${MYSQL_LIBRARY_RELEASE}
${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
${PYTHON_LIBRARY}
${TBB_LIBRARIES}
${ZLIB_LIBRARY_RELEASE}
-)
+)
View
3 src/swganh/app/CMakeLists.txt
@@ -4,8 +4,7 @@ AddANHPythonBinding(app
PREFIX_NAME swgpy
DEPENDS
swganh_lib
- anh_lib
- ADDITIONAL_INCLUDE_DIRS
+ ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
View
3 src/swganh/app/swganh_app.cc
@@ -40,11 +40,10 @@
#include "version.h"
-using namespace swganh;
-using namespace swganh::app;
using namespace boost::asio;
using namespace boost::program_options;
using namespace std;
+using namespace swganh;
using namespace swganh::app;
using namespace swganh::chat;
using namespace swganh::login;
View
3 src/swganh/combat/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHPythonBinding)
AddANHPythonBinding(combat
PREFIX_NAME swgpy
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
3 src/swganh/command/CMakeLists.txt
@@ -4,8 +4,7 @@ AddANHPythonBinding(command
PREFIX_NAME swgpy
DEPENDS
swganh_lib
- anh_lib
- ADDITIONAL_INCLUDE_DIRS
+ ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
View
3 src/swganh/equipment/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHPythonBinding)
AddANHPythonBinding(equipment
PREFIX_NAME swgpy
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
2 src/swganh/equipment/equipment_service_interface.h
@@ -1,6 +1,6 @@
#pragma once
-#include <anh/service/service_interface.h>
+#include <swganh/service/service_interface.h>
namespace swganh
{
View
2 src/swganh/main.cc
@@ -34,7 +34,7 @@ int main(int argc, char* argv[])
if (swganh::KeyboardHit())
{
char input = swganh::GetHitKey();
- if (input == '`')
+ if (input == '`' || input =='~')
{
app.StartInteractiveConsole();
}
View
3 src/swganh/object/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHPythonBinding)
AddANHPythonBinding(object
PREFIX_NAME swgpy
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
pub14_core_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
View
2 src/swganh/object/container_interface.h
@@ -4,7 +4,7 @@
#include <memory>
#include <functional>
-#include <anh/observer/observer_interface.h>
+#include <swganh/observer/observer_interface.h>
#include <boost/thread/shared_mutex.hpp>
#include <glm/glm.hpp>
View
3 src/swganh/simulation/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHPythonBinding)
AddANHPythonBinding(simulation
PREFIX_NAME swgpy
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
3 src/swganh/social/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHPythonBinding)
AddANHPythonBinding(social
PREFIX_NAME swgpy
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
2 src/swganh/spawn/spawn_service_interface.h
@@ -1,7 +1,7 @@
#ifndef SWGANH_SPAWN_SERVICE_INTERFACE_H_
#define SWGANH_SPAWN_SERVICE_INTERFACE_H_
-#include <anh/service/service_interface.h>
+#include <swganh/service/service_interface.h>
namespace swganh
{
View
3 src/swganh/sui/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHPythonBinding)
AddANHPythonBinding(sui
PREFIX_NAME swgpy
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
2 src/swganh/sui/sui_service_interface.h
@@ -1,7 +1,7 @@
#pragma once
#include <memory>
-#include <anh/service/service_interface.h>
+#include <swganh/service/service_interface.h>
namespace swganh
View
3 src/swganh/terrain/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHPythonBinding)
AddANHPythonBinding(terrain
PREFIX_NAME swgpy
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
2 src/swganh/tre/config_reader.cc
@@ -15,7 +15,7 @@
#include <boost/filesystem.hpp>
-#include <anh/logger.h>
+#include <swganh/logger.h>
using namespace swganh::tre;
View
2 src/swganh/tre/iff/iff.h
@@ -9,7 +9,7 @@
#include <memory>
#include <functional>
-#include <anh/byte_buffer.h>
+#include <swganh/byte_buffer.h>
#include <swganh/tre/visitors/visitor_interface.h>
View
2 src/swganh/tre/visitors/snapshot/ws_visitor.cc
@@ -2,7 +2,7 @@
// See file LICENSE or go to http://swganh.com/LICENSE
#include "ws_visitor.h"
-#include <anh/byte_buffer.h>
+#include <swganh/byte_buffer.h>
using namespace std;
using namespace swganh::tre;
View
2 src/swganh/tre/visitors/terrain/detail/header.h
@@ -1,7 +1,7 @@
#pragma once
#include <string>
-#include <anh/byte_buffer.h>
+#include <swganh/byte_buffer.h>
namespace swganh
{
View
2 src/swganh/tre/visitors/terrain/detail/layer.h
@@ -1,6 +1,6 @@
#pragma once
-#include <anh/byte_buffer.h>
+#include <swganh/byte_buffer.h>
#include <iostream>
namespace swganh
View
2 src/swganh/tre/visitors/terrain/detail/layer_loader.cc
@@ -1,6 +1,6 @@
#include "layer_loader.h"
-#include <anh/byte_buffer.h>
+#include <swganh/byte_buffer.h>
#include "container_layer.h"
#include "boundary_circle.h"
View
3 src/swganh/utilities/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHPythonBinding)
AddANHPythonBinding(utility
PREFIX_NAME swgpy
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
2 src/swganh/utilities/glm_binding.cc
@@ -1,7 +1,7 @@
// This file is part of SWGANH which is released under the MIT license.
// See file LICENSE or go to http://swganh.com/LICENSE
-#include <anh/utility_python.h>
+#include <swganh/utility_python.h>
#include <glm/glm.hpp>
#include <glm/gtx/quaternion.hpp>
View
3 src/swganh/weather/CMakeLists.txt
@@ -3,8 +3,7 @@ include(ANHPythonBinding)
AddANHPythonBinding(weather
PREFIX_NAME swgpy
DEPENDS
- swganh_lib
- anh_lib
+ swganh_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
2 tools/cmake/ANHExecutable.cmake
@@ -99,7 +99,7 @@ FUNCTION(AddANHExecutable name)
SET(__project_library "${name}_lib")
list(REMOVE_ITEM SOURCES ${MAIN_EXISTS})
-
+ MESSAGE("ANH Depends" ${name})
AddANHLibrary(${name}
DEPENDS
${ANHEXE_DEPENDS}
View
2 tools/cmake/ANHLibrary.cmake
@@ -164,7 +164,7 @@ FUNCTION(AddANHLibrary name)
TARGET_LINK_LIBRARIES(${name}_test
${ANHLIB_DEPENDS})
add_dependencies(${name}_test DEPS)
-
+ MESSAGE("link dependencies in " ${name}_test ${ANHLIB_DEPENDS})
IF(_debug_list_length GREATER 0)
FOREACH(debug_library ${ANHLIB_DEBUG_LIBRARIES})
if (NOT ${debug_library} MATCHES ".*NOTFOUND")

0 comments on commit 2bce8d6

Please sign in to comment.
Something went wrong with that request. Please try again.