Skip to content

Commit 7a5216c

Browse files
intorrintorr
committed
WIP of xrAI and xrSE_Factory. AdditionalIncludeDirectories reorganization and PreprocessorDefinitions cleanup.
1 parent 195a705 commit 7a5216c

File tree

6 files changed

+25
-33
lines changed

6 files changed

+25
-33
lines changed

‎src/utils/xrSE_Factory/properties_list_helper_script.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#include "script_space.h"
1111
#include "script_properties_list_helper.h"
1212
#include "ai_space.h"
13+
#include "xrCore/ModuleLookup.hpp"
1314
#include "xrScriptEngine/script_engine.hpp"
14-
#include "script_token_list.h"
1515
#include "xrScriptEngine/ScriptExporter.hpp"
16-
#include "xrCore/ModuleLookup.hpp"
16+
#include "xrServerEntities/script_token_list.h"
1717

1818
using namespace luabind;
1919

‎src/utils/xrSE_Factory/script_properties_list_helper.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#include "stdafx.h"
1010
#include "script_properties_list_helper.h"
11-
#include "script_token_list.h"
12-
#include "xrServer_Object_Base.h"
13-
#include "script_value_container_impl.h"
11+
#include "xrServerEntities/script_token_list.h"
12+
#include "xrServerEntities/xrServer_Object_Base.h"
13+
#include "xrServerEntities/script_value_container_impl.h"
1414
#include "script_value_wrapper.h"
1515
#include "script_space.h"
1616

‎src/utils/xrSE_Factory/script_properties_list_helper.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
#ifndef XRGAME_EXPORTS
1313
#include "xrSound/Sound.h"
1414
#endif
15-
#include "xrEProps.h"
16-
15+
#include "xrServerEntities\xrEProps.h"
16+
#include "xrServerEntities\script_rtoken_list.h"
1717
#include "script_space.h"
18-
#include "script_rtoken_list.h"
1918

2019
class CScriptTokenList;
2120

‎src/utils/xrSE_Factory/stdafx.h‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,14 @@
1010

1111
#define ENGINE_API
1212
#define ECORE_API
13-
//#define DLL_API XR_EXPORT
1413
#define XRSCRIPTENGINE_EXPORTS
15-
//#define XRGAME_EXPORTS
1614

1715
#include "Common/Common.hpp"
1816
#include "xrCore/xrCore.h"
19-
#include "xrScriptEngine/xrScriptEngine.hpp"
20-
#include "xrScriptEngine/DebugMacros.hpp" // XXX: move debug macros to xrCore
21-
#include "xrCDB/xrCDB.h"
2217
#include "xrCore/_fbox.h"
2318
#include "xrCore/_quaternion.h"
24-
25-
#include "clsid_game.h"
26-
27-
#include "smart_cast.h"
19+
#include "xrScriptEngine/DebugMacros.hpp" // XXX: move debug macros to xrCore
20+
#include "xrServerEntities/smart_cast.h"
2821

2922
#define READ_IF_EXISTS(ltx, method, section, name, default_value)\
3023
(ltx->line_exist(section, name)) ? ltx->method(section, name) : default_value

‎src/utils/xrSE_Factory/xrSE_Factory.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
#include "stdafx.h"
1010
#include "xrSE_Factory.h"
1111
#include "ai_space.h"
12+
#include "xrCore/ModuleLookup.hpp"
1213
#include "xrScriptEngine/script_engine.hpp"
13-
#include "object_factory.h"
14+
#include "xrServerEntities/object_factory.h"
15+
#include "xrServerEntities/character_info.h"
16+
#include "xrServerEntities/specific_character.h"
1417
#include "xrSE_Factory_import_export.h"
1518
#include "script_properties_list_helper.h"
16-
#include "xrCore/ModuleLookup.hpp"
1719

18-
#include "character_info.h"
19-
#include "specific_character.h"
2020

2121
extern CSE_Abstract* F_entity_Create(LPCSTR section);
2222

‎src/utils/xrSE_Factory/xrSE_Factory.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,38 +97,38 @@
9797
</PropertyGroup>
9898
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9999
<ClCompile>
100-
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
101-
<PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100+
<AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
101+
<PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
102102
</ClCompile>
103103
</ItemDefinitionGroup>
104104
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
105105
<ClCompile>
106-
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107-
<PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106+
<AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107+
<PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108108
</ClCompile>
109109
</ItemDefinitionGroup>
110110
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
111111
<ClCompile>
112-
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
113-
<PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112+
<AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
113+
<PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
114114
</ClCompile>
115115
</ItemDefinitionGroup>
116116
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
117117
<ClCompile>
118-
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119-
<PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118+
<AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119+
<PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
120120
</ClCompile>
121121
</ItemDefinitionGroup>
122122
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
123123
<ClCompile>
124-
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
125-
<PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124+
<AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
125+
<PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126126
</ClCompile>
127127
</ItemDefinitionGroup>
128128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
129129
<ClCompile>
130-
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
131-
<PreprocessorDefinitions>_USRDLL;XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
130+
<AdditionalIncludeDirectories>$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
131+
<PreprocessorDefinitions>XRSE_FACTORY_EXPORTS;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
132132
</ClCompile>
133133
</ItemDefinitionGroup>
134134
<ItemGroup>

0 commit comments

Comments
 (0)