WIP of xrAI and xrSE_Factory. AdditionalIncludeDirectories reorganiza…

…tion and PreprocessorDefinitions cleanup.
OpenXRay · Jan 1, 2018 · 7a5216c · 7a5216c
1 parent 195a705
commit 7a5216c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -97,38 +97,38 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>