From 7a5216ce2a7f7c27ea65c363f68183ef9621d6a4 Mon Sep 17 00:00:00 2001 From: Igor Novikov Date: Mon, 1 Jan 2018 23:30:46 +0500 Subject: [PATCH] WIP of xrAI and xrSE_Factory. AdditionalIncludeDirectories reorganization and PreprocessorDefinitions cleanup. --- .../properties_list_helper_script.cpp | 4 ++-- .../script_properties_list_helper.cpp | 6 ++--- .../script_properties_list_helper.h | 5 ++-- src/utils/xrSE_Factory/stdafx.h | 11 ++------- src/utils/xrSE_Factory/xrSE_Factory.cpp | 8 +++---- src/utils/xrSE_Factory/xrSE_Factory.vcxproj | 24 +++++++++---------- 6 files changed, 25 insertions(+), 33 deletions(-) diff --git a/src/utils/xrSE_Factory/properties_list_helper_script.cpp b/src/utils/xrSE_Factory/properties_list_helper_script.cpp index 5e1c8a56ebb..870bf0fd3d1 100644 --- a/src/utils/xrSE_Factory/properties_list_helper_script.cpp +++ b/src/utils/xrSE_Factory/properties_list_helper_script.cpp @@ -10,10 +10,10 @@ #include "script_space.h" #include "script_properties_list_helper.h" #include "ai_space.h" +#include "xrCore/ModuleLookup.hpp" #include "xrScriptEngine/script_engine.hpp" -#include "script_token_list.h" #include "xrScriptEngine/ScriptExporter.hpp" -#include "xrCore/ModuleLookup.hpp" +#include "xrServerEntities/script_token_list.h" using namespace luabind; diff --git a/src/utils/xrSE_Factory/script_properties_list_helper.cpp b/src/utils/xrSE_Factory/script_properties_list_helper.cpp index 8551782ad52..f02e47e7cf6 100644 --- a/src/utils/xrSE_Factory/script_properties_list_helper.cpp +++ b/src/utils/xrSE_Factory/script_properties_list_helper.cpp @@ -8,9 +8,9 @@ #include "stdafx.h" #include "script_properties_list_helper.h" -#include "script_token_list.h" -#include "xrServer_Object_Base.h" -#include "script_value_container_impl.h" +#include "xrServerEntities/script_token_list.h" +#include "xrServerEntities/xrServer_Object_Base.h" +#include "xrServerEntities/script_value_container_impl.h" #include "script_value_wrapper.h" #include "script_space.h" diff --git a/src/utils/xrSE_Factory/script_properties_list_helper.h b/src/utils/xrSE_Factory/script_properties_list_helper.h index a06f9770945..a9c6128f86a 100644 --- a/src/utils/xrSE_Factory/script_properties_list_helper.h +++ b/src/utils/xrSE_Factory/script_properties_list_helper.h @@ -12,10 +12,9 @@ #ifndef XRGAME_EXPORTS #include "xrSound/Sound.h" #endif -#include "xrEProps.h" - +#include "xrServerEntities\xrEProps.h" +#include "xrServerEntities\script_rtoken_list.h" #include "script_space.h" -#include "script_rtoken_list.h" class CScriptTokenList; diff --git a/src/utils/xrSE_Factory/stdafx.h b/src/utils/xrSE_Factory/stdafx.h index 5fd7b61bda9..90d1ba8598c 100644 --- a/src/utils/xrSE_Factory/stdafx.h +++ b/src/utils/xrSE_Factory/stdafx.h @@ -10,21 +10,14 @@ #define ENGINE_API #define ECORE_API -//#define DLL_API XR_EXPORT #define XRSCRIPTENGINE_EXPORTS -//#define XRGAME_EXPORTS #include "Common/Common.hpp" #include "xrCore/xrCore.h" -#include "xrScriptEngine/xrScriptEngine.hpp" -#include "xrScriptEngine/DebugMacros.hpp" // XXX: move debug macros to xrCore -#include "xrCDB/xrCDB.h" #include "xrCore/_fbox.h" #include "xrCore/_quaternion.h" - -#include "clsid_game.h" - -#include "smart_cast.h" +#include "xrScriptEngine/DebugMacros.hpp" // XXX: move debug macros to xrCore +#include "xrServerEntities/smart_cast.h" #define READ_IF_EXISTS(ltx, method, section, name, default_value)\ (ltx->line_exist(section, name)) ? ltx->method(section, name) : default_value diff --git a/src/utils/xrSE_Factory/xrSE_Factory.cpp b/src/utils/xrSE_Factory/xrSE_Factory.cpp index f60656602cd..b41b8aab088 100644 --- a/src/utils/xrSE_Factory/xrSE_Factory.cpp +++ b/src/utils/xrSE_Factory/xrSE_Factory.cpp @@ -9,14 +9,14 @@ #include "stdafx.h" #include "xrSE_Factory.h" #include "ai_space.h" +#include "xrCore/ModuleLookup.hpp" #include "xrScriptEngine/script_engine.hpp" -#include "object_factory.h" +#include "xrServerEntities/object_factory.h" +#include "xrServerEntities/character_info.h" +#include "xrServerEntities/specific_character.h" #include "xrSE_Factory_import_export.h" #include "script_properties_list_helper.h" -#include "xrCore/ModuleLookup.hpp" -#include "character_info.h" -#include "specific_character.h" extern CSE_Abstract* F_entity_Create(LPCSTR section); diff --git a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj index a93b69f0675..d020c2b0e92 100644 --- a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj +++ b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj @@ -97,38 +97,38 @@ - $(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) - _USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions) + $(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions) - $(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) - _USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions) + $(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions) - $(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) - _USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions) + $(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions) - $(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) - _USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions) + $(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions) - $(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) - _USRDLL;XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions) + $(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions) - $(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) - _USRDLL;XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions) + $(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions)