Skip to content

Commit

Permalink
Merge xrXMLParser into xrCore. Close OpenXRay#43.
Browse files Browse the repository at this point in the history
  • Loading branch information
nitrocaster committed Jan 25, 2016
1 parent 7e5ea13 commit 3f12bb1
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 358 deletions.
32 changes: 0 additions & 32 deletions src/engine.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrRender_R2", "Layers\xrRen
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrSound", "xrSound\xrSound.vcxproj", "{CCCA7859-EB86-493E-9B53-C4235F45B3C5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrXMLParser", "xrXMLParser\xrXMLParser.vcxproj", "{94A1C366-3D19-48E6-8170-4ADC2E70DF98}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LW_Export_80", "plugins\lw\LW_Export80.vcxproj", "{F573DE85-0866-4775-955F-6C3241D2AE80}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LW_Server", "plugins\lw\LW_Server.vcxproj", "{6BA3121A-ACBC-4685-9246-4549CA1EFFFD}"
Expand Down Expand Up @@ -883,36 +881,6 @@ Global
{CCCA7859-EB86-493E-9B53-C4235F45B3C5}.Release|Win32.ActiveCfg = Release|Win32
{CCCA7859-EB86-493E-9B53-C4235F45B3C5}.Release|Win32.Build.0 = Release|Win32
{CCCA7859-EB86-493E-9B53-C4235F45B3C5}.Release|x64.ActiveCfg = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Debug_Dedicated|x64.ActiveCfg = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Debug_Dedicated|x64.Build.0 = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Debug|Win32.ActiveCfg = Debug|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Debug|Win32.Build.0 = Debug|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Debug|x64.ActiveCfg = Debug|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Mixed|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Mixed_Dedicated|Mixed Platforms.Build.0 = Mixed|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Mixed_Dedicated|Win32.ActiveCfg = Mixed|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Mixed_Dedicated|x64.ActiveCfg = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Mixed_Dedicated|x64.Build.0 = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Mixed|Mixed Platforms.ActiveCfg = Mixed|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Mixed|Mixed Platforms.Build.0 = Mixed|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Mixed|Win32.ActiveCfg = Mixed|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Mixed|Win32.Build.0 = Mixed|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Mixed|x64.ActiveCfg = Mixed|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Release_Dedicated|x64.ActiveCfg = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Release_Dedicated|x64.Build.0 = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Release|Mixed Platforms.Build.0 = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Release|Win32.ActiveCfg = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Release|Win32.Build.0 = Release|Win32
{94A1C366-3D19-48E6-8170-4ADC2E70DF98}.Release|x64.ActiveCfg = Release|Win32
{F573DE85-0866-4775-955F-6C3241D2AE80}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
{F573DE85-0866-4775-955F-6C3241D2AE80}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
{F573DE85-0866-4775-955F-6C3241D2AE80}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
Expand Down
0 src/xrXMLParser/tinystr.cpp → src/xrCore/Xml/tinystr.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/xrXMLParser/tinystr.h → src/xrCore/Xml/tinystr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class TiXmlString
{
// The rep_ is really an array of ints. (see the allocator, above).
// Cast it back before delete, so the compiler won't incorrectly call destructors.
xr_free( reinterpret_cast<int*>( rep_ ) );
xr_free( reinterpret_cast<int *&>( rep_ ) );
}
}

Expand Down
0 src/xrXMLParser/tinyxml.cpp → src/xrCore/Xml/tinyxml.cpp
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions src/xrXMLParser/tinyxml.h → src/xrCore/Xml/tinyxml.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ const TiXmlEncoding TIXML_DEFAULT_ENCODING = TIXML_ENCODING_UNKNOWN;
A Decleration contains: Attributes (not on tree)
@endverbatim
*/
class XRXMLPARSER_API TiXmlBase
class XRCORE_API TiXmlBase
{
friend class TiXmlNode;
friend class TiXmlElement;
Expand Down Expand Up @@ -418,7 +418,7 @@ class XRXMLPARSER_API TiXmlBase
in a document, or stand on its own. The type of a TiXmlNode
can be queried, and it can be cast to its more defined type.
*/
class XRXMLPARSER_API TiXmlNode : public TiXmlBase
class XRCORE_API TiXmlNode : public TiXmlBase
{
friend class TiXmlDocument;
friend class TiXmlElement;
Expand Down
0 src/xrXMLParser/tinyxmlerror.cpp → src/xrCore/Xml/tinyxmlerror.cpp
View file
File renamed without changes.
0 src/xrXMLParser/tinyxmlparser.cpp → src/xrCore/Xml/tinyxmlparser.cpp
View file
File renamed without changes.
20 changes: 2 additions & 18 deletions src/xrXMLParser/xrXMLParser.cpp → src/xrCore/Xml/xrXMLParser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
#include "xrXMLParser.h"


XRXMLPARSER_API CXml::CXml()
CXml::CXml()
: m_root (NULL),
m_pLocalRoot (NULL)
{}

XRXMLPARSER_API CXml::~CXml()
CXml::~CXml()
{
ClearInternal();
}
Expand Down Expand Up @@ -456,19 +456,3 @@ LPCSTR CXml::CheckUniqueAttrib (XML_NODE* start_node, LPCSTR tag_name, LPCSTR at
return NULL;
}
#endif

BOOL APIENTRY DllMain( HANDLE hModule,
u32 ul_reason_for_call,
LPVOID lpReserved
)
{
switch (ul_reason_for_call)
{
case DLL_PROCESS_ATTACH: {
break;
}
case DLL_PROCESS_DETACH:
break;
}
return TRUE;
}
9 changes: 1 addition & 8 deletions src/xrXMLParser/xrXMLParser.h → src/xrCore/Xml/xrXMLParser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@

#include "Common/Platform.hpp"

#ifdef XRXMLPARSER_EXPORTS
#define XRXMLPARSER_API XR_EXPORT
#else
#define XRXMLPARSER_API XR_IMPORT
#pragma comment (lib,"xrXMLParser.lib")
#endif

const LPCSTR CONFIG_PATH = "$game_config$";
const LPCSTR UI_PATH = "ui";

Expand All @@ -20,7 +13,7 @@ const LPCSTR UI_PATH = "ui";
typedef TiXmlNode XML_NODE;
typedef TiXmlAttribute XML_ATTRIBUTE;

class XRXMLPARSER_API CXml
class XRCORE_API CXml
{
void Load (LPCSTR path_alias, LPCSTR xml_filename);
public:
Expand Down
8 changes: 8 additions & 0 deletions src/xrCore/xrCore.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,11 @@
<ClCompile Include="Threading\Event.cpp" />
<ClCompile Include="Threading\ttapi.cpp" />
<ClCompile Include="Threading\Lock.cpp" />
<ClCompile Include="Xml\tinystr.cpp" />
<ClCompile Include="Xml\tinyxml.cpp" />
<ClCompile Include="Xml\tinyxmlerror.cpp" />
<ClCompile Include="Xml\tinyxmlparser.cpp" />
<ClCompile Include="Xml\xrXMLParser.cpp" />
<ClCompile Include="xrCore.cpp" />
<ClCompile Include="ModuleLookup.cpp" />
<ClCompile Include="xrDebug.cpp" />
Expand Down Expand Up @@ -372,6 +377,9 @@
<ClInclude Include="Threading\ttapi.h" />
<ClInclude Include="Threading\Lock.hpp" />
<ClInclude Include="vector.h" />
<ClInclude Include="Xml\tinystr.h" />
<ClInclude Include="Xml\tinyxml.h" />
<ClInclude Include="Xml\xrXMLParser.h" />
<ClInclude Include="xrCore.h" />
<ClInclude Include="ModuleLookup.hpp" />
<ClInclude Include="xrDebug.h" />
Expand Down
30 changes: 30 additions & 0 deletions src/xrCore/xrCore.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@
<Filter Include="Math\RNG">
<UniqueIdentifier>{ba09a2fb-b14c-4c35-8e0d-957a47930740}</UniqueIdentifier>
</Filter>
<Filter Include="Xml">
<UniqueIdentifier>{f365c098-99bb-41a7-858d-12ba18a1311e}</UniqueIdentifier>
</Filter>
<Filter Include="Xml\TinyXML">
<UniqueIdentifier>{eb0bfab5-c514-4df4-a747-d14beb72f57b}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="FTimer.cpp">
Expand Down Expand Up @@ -360,6 +366,21 @@
<ClCompile Include="Debug\StackTrace.cpp">
<Filter>Debug core</Filter>
</ClCompile>
<ClCompile Include="Xml\tinystr.cpp">
<Filter>Xml</Filter>
</ClCompile>
<ClCompile Include="Xml\tinyxml.cpp">
<Filter>Xml</Filter>
</ClCompile>
<ClCompile Include="Xml\tinyxmlerror.cpp">
<Filter>Xml</Filter>
</ClCompile>
<ClCompile Include="Xml\tinyxmlparser.cpp">
<Filter>Xml</Filter>
</ClCompile>
<ClCompile Include="Xml\xrXMLParser.cpp">
<Filter>Xml</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="FTimer.h">
Expand Down Expand Up @@ -773,6 +794,15 @@
<ClInclude Include="..\Common\Noncopyable.hpp">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="Xml\tinystr.h">
<Filter>Xml</Filter>
</ClInclude>
<ClInclude Include="Xml\tinyxml.h">
<Filter>Xml</Filter>
</ClInclude>
<ClInclude Include="Xml\xrXMLParser.h">
<Filter>Xml</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="xrCore.rc">
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/ui/xrUIXmlParser.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "xrXMLParser/xrXMLParser.h"
#include "xrCore/Xml/xrXMLParser.h"

class CUIXml : public CXml
{
Expand Down
4 changes: 0 additions & 4 deletions src/xrGame/xrGame.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3873,10 +3873,6 @@
<Project>{98d24a3d-7666-4c11-9d6e-b10393ce8cba}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="$(SolutionDir)xrXMLParser\xrXMLParser.vcxproj">
<Project>{94a1c366-3d19-48e6-8170-4adc2e70df98}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\xrScriptEngine\xrScriptEngine.vcxproj">
<Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
</ProjectReference>
Expand Down
4 changes: 0 additions & 4 deletions src/xrXMLParser/StdAfx.cpp
View file

This file was deleted.

22 changes: 0 additions & 22 deletions src/xrXMLParser/stdafx.h
View file

This file was deleted.

Loading

0 comments on commit 3f12bb1

Please sign in to comment.