Update project and build files after removing StringStorage.h/.cpp

Build/Rocket.xcodeproj/project.pbxproj

@@ -134,7 +134,6 @@
 		6E8B1E39123ABCC200C451C8 /* StreamMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E9D09291209823B00099E1A /* StreamMemory.cpp */; };
 		6E8B1E3A123ABCC200C451C8 /* String.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E9D099B1209878A00099E1A /* String.cpp */; };
 		6E8B1E3B123ABCC200C451C8 /* StringCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EF28DE612058A45000FAF17 /* StringCache.cpp */; };
-		6E8B1E3C123ABCC200C451C8 /* StringStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E9D09911209872400099E1A /* StringStorage.cpp */; };
 		6E8B1E3D123ABCC200C451C8 /* StringUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E9D092A1209823B00099E1A /* StringUtilities.cpp */; };
 		6E8B1E3E123ABCC200C451C8 /* StyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EF28DE812058A45000FAF17 /* StyleSheet.cpp */; };
 		6E8B1E3F123ABCC200C451C8 /* StyleSheetFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EF28DE912058A45000FAF17 /* StyleSheetFactory.cpp */; };
@@ -237,7 +236,6 @@
 		6E9D09331209823B00099E1A /* Variant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E9D092C1209823B00099E1A /* Variant.cpp */; };
 		6E9D09781209858B00099E1A /* Math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E9D09771209858B00099E1A /* Math.cpp */; };
 		6E9D0988120986B600099E1A /* ReferenceCountable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E9D0987120986B600099E1A /* ReferenceCountable.cpp */; };
-		6E9D09921209872400099E1A /* StringStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E9D09911209872400099E1A /* StringStorage.cpp */; };
 		6E9D099C1209878A00099E1A /* String.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E9D099B1209878A00099E1A /* String.cpp */; };
 		6EF28B79120580DA000FAF17 /* Box.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EF28B78120580DA000FAF17 /* Box.cpp */; };
 		6EF28E2F12058A45000FAF17 /* Clock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EF28D0312058A45000FAF17 /* Clock.cpp */; };
@@ -448,7 +446,6 @@
 		6EF3BCEB12481DD40014316D /* String.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EF3BBEC12481DD40014316D /* String.h */; };
 		6EF3BCEC12481DD40014316D /* StringBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EF3BBED12481DD40014316D /* StringBase.h */; };
 		6EF3BCED12481DD40014316D /* StringBase.inl in Resources */ = {isa = PBXBuildFile; fileRef = 6EF3BBEE12481DD40014316D /* StringBase.inl */; };
-		6EF3BCEE12481DD40014316D /* StringStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EF3BBEF12481DD40014316D /* StringStorage.h */; };
 		6EF3BCEF12481DD40014316D /* StringUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EF3BBF012481DD40014316D /* StringUtilities.h */; };
 		6EF3BCF012481DD40014316D /* StyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EF3BBF112481DD40014316D /* StyleSheet.h */; };
 		6EF3BCF112481DD40014316D /* StyleSheetKeywords.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EF3BBF212481DD40014316D /* StyleSheetKeywords.h */; };
@@ -595,7 +592,6 @@
 		6E9D092C1209823B00099E1A /* Variant.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Variant.cpp; path = ../Source/Core/Variant.cpp; sourceTree = SOURCE_ROOT; };
 		6E9D09771209858B00099E1A /* Math.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Math.cpp; path = ../Source/Core/Math.cpp; sourceTree = SOURCE_ROOT; };
 		6E9D0987120986B600099E1A /* ReferenceCountable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ReferenceCountable.cpp; path = ../Source/Core/ReferenceCountable.cpp; sourceTree = SOURCE_ROOT; };
-		6E9D09911209872400099E1A /* StringStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringStorage.cpp; path = ../Source/Core/StringStorage.cpp; sourceTree = SOURCE_ROOT; };
 		6E9D099B1209878A00099E1A /* String.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; name = String.cpp; path = ../Source/Core/String.cpp; sourceTree = SOURCE_ROOT; };
 		6EF28B78120580DA000FAF17 /* Box.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Box.cpp; path = ../Source/Core/Box.cpp; sourceTree = SOURCE_ROOT; };
 		6EF28D0312058A45000FAF17 /* Clock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Clock.cpp; path = ../Source/Core/Clock.cpp; sourceTree = SOURCE_ROOT; };
@@ -795,7 +791,6 @@
 		6EF3BBEC12481DD40014316D /* String.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = String.h; path = ../Include/Rocket/Core/String.h; sourceTree = SOURCE_ROOT; };
 		6EF3BBED12481DD40014316D /* StringBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringBase.h; path = ../Include/Rocket/Core/StringBase.h; sourceTree = SOURCE_ROOT; };
 		6EF3BBEE12481DD40014316D /* StringBase.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StringBase.inl; path = ../Include/Rocket/Core/StringBase.inl; sourceTree = SOURCE_ROOT; };
-		6EF3BBEF12481DD40014316D /* StringStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringStorage.h; path = ../Include/Rocket/Core/StringStorage.h; sourceTree = SOURCE_ROOT; };
 		6EF3BBF012481DD40014316D /* StringUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringUtilities.h; path = ../Include/Rocket/Core/StringUtilities.h; sourceTree = SOURCE_ROOT; };
 		6EF3BBF112481DD40014316D /* StyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleSheet.h; path = ../Include/Rocket/Core/StyleSheet.h; sourceTree = SOURCE_ROOT; };
 		6EF3BBF212481DD40014316D /* StyleSheetKeywords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleSheetKeywords.h; path = ../Include/Rocket/Core/StyleSheetKeywords.h; sourceTree = SOURCE_ROOT; };
@@ -939,7 +934,6 @@
 				6EF3BBEC12481DD40014316D /* String.h */,
 				6EF3BBED12481DD40014316D /* StringBase.h */,
 				6EF3BBEE12481DD40014316D /* StringBase.inl */,
-				6EF3BBEF12481DD40014316D /* StringStorage.h */,
 				6EF3BBF012481DD40014316D /* StringUtilities.h */,
 				6EF3BBF112481DD40014316D /* StyleSheet.h */,
 				6EF3BBF212481DD40014316D /* StyleSheetKeywords.h */,
@@ -1046,7 +1040,6 @@
 				6E9D09291209823B00099E1A /* StreamMemory.cpp */,
 				6E9D099B1209878A00099E1A /* String.cpp */,
 				6EF28DE612058A45000FAF17 /* StringCache.cpp */,
-				6E9D09911209872400099E1A /* StringStorage.cpp */,
 				6E9D092A1209823B00099E1A /* StringUtilities.cpp */,
 				6EF28DE812058A45000FAF17 /* StyleSheet.cpp */,
 				6EF28DE912058A45000FAF17 /* StyleSheetFactory.cpp */,
@@ -1285,7 +1278,6 @@
 				6EF3BCEA12481DD40014316D /* StreamMemory.h in Headers */,
 				6EF3BCEB12481DD40014316D /* String.h in Headers */,
 				6EF3BCEC12481DD40014316D /* StringBase.h in Headers */,
-				6EF3BCEE12481DD40014316D /* StringStorage.h in Headers */,
 				6EF3BCEF12481DD40014316D /* StringUtilities.h in Headers */,
 				6EF3BCF012481DD40014316D /* StyleSheet.h in Headers */,
 				6EF3BCF112481DD40014316D /* StyleSheetKeywords.h in Headers */,
@@ -1672,7 +1664,6 @@
 				6E8B1E39123ABCC200C451C8 /* StreamMemory.cpp in Sources */,
 				6E8B1E3A123ABCC200C451C8 /* String.cpp in Sources */,
 				6E8B1E3B123ABCC200C451C8 /* StringCache.cpp in Sources */,
-				6E8B1E3C123ABCC200C451C8 /* StringStorage.cpp in Sources */,
 				6E8B1E3D123ABCC200C451C8 /* StringUtilities.cpp in Sources */,
 				6E8B1E3E123ABCC200C451C8 /* StyleSheet.cpp in Sources */,
 				6E8B1E3F123ABCC200C451C8 /* StyleSheetFactory.cpp in Sources */,
@@ -1920,7 +1911,6 @@
 				6E9D09331209823B00099E1A /* Variant.cpp in Sources */,
 				6E9D09781209858B00099E1A /* Math.cpp in Sources */,
 				6E9D0988120986B600099E1A /* ReferenceCountable.cpp in Sources */,
-				6E9D09921209872400099E1A /* StringStorage.cpp in Sources */,
 				6E9D099C1209878A00099E1A /* String.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Build/RocketCore.vcproj

@@ -1,1506 +1,1498 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="RocketCore"
-	ProjectGUID="{1AAC0B29-AEB9-4E3F-8EDF-B46F8949C41B}"
-	RootNamespace="rocket"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\vsprops\BuildConfigurationDLLDebug.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Include;..\..\support\freetype\include"
-				UsePrecompiledHeader="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="freetype243MT_D.lib"
-				OutputFile="..\bin\$(ProjectName)_d.dll"
-				AdditionalLibraryDirectories="..\..\support\lib"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\vsprops\BuildConfigurationDLLRelease.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Include;..\..\support\freetype\include"
-				UsePrecompiledHeader="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="freetype243MT.lib"
-				OutputFile="..\bin\$(ProjectName).dll"
-				AdditionalLibraryDirectories="..\..\support\lib"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Precompiled Header"
-			>
-			<File
-				RelativePath="..\Source\Core\precompiled.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\Source\Core\precompiled.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Texture"
-			>
-			<File
-				RelativePath="..\Source\Core\Texture.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Texture.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\TextureDatabase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\TextureDatabase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\TextureResource.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\TextureResource.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Element"
-			>
-			<File
-				RelativePath="..\Source\Core\Box.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Box.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\DocumentHeader.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\DocumentHeader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\Element.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Element.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Element.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ElementBackground.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ElementBackground.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ElementBorder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ElementBorder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ElementDecoration.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ElementDecoration.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ElementReference.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\ElementReference.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ElementScroll.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\ElementScroll.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ElementStyle.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ElementStyle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ElementUtilities.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\ElementUtilities.h"
-				>
-			</File>
-			<Filter
-				Name="Layout"
-				>
-				<File
-					RelativePath="..\Source\Core\LayoutBlockBox.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\LayoutBlockBox.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\LayoutBlockBoxSpace.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\LayoutBlockBoxSpace.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\LayoutEngine.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\LayoutEngine.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\LayoutInlineBox.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\LayoutInlineBox.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\LayoutInlineBoxText.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\LayoutInlineBoxText.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\LayoutLineBox.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\LayoutLineBox.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Instancer"
-				>
-				<File
-					RelativePath="..\Source\Core\ElementInstancer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\ElementInstancer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\ElementInstancerGeneric.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\ElementInstancerGeneric.inl"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Parser"
-				>
-				<File
-					RelativePath="..\Source\Core\XMLNodeHandler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\XMLNodeHandler.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\XMLNodeHandlerBody.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\XMLNodeHandlerBody.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\XMLNodeHandlerDefault.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\XMLNodeHandlerDefault.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\XMLNodeHandlerHead.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\XMLNodeHandlerHead.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\XMLNodeHandlerTemplate.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\XMLNodeHandlerTemplate.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\XMLParser.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\XMLParser.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\XMLParseTools.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\XMLParseTools.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Definition"
-				>
-				<File
-					RelativePath="..\Source\Core\ElementDefinition.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\ElementDefinition.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Text"
-				>
-				<File
-					RelativePath="..\Source\Core\ElementText.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\ElementText.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\ElementTextDefault.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\ElementTextDefault.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Handle"
-				>
-				<File
-					RelativePath="..\Source\Core\ElementHandle.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\ElementHandle.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Widgets"
-				>
-				<File
-					RelativePath="..\Source\Core\WidgetSlider.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\WidgetSlider.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\WidgetSliderScroll.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\WidgetSliderScroll.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Image"
-				>
-				<File
-					RelativePath="..\Source\Core\ElementImage.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\ElementImage.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Document"
-				>
-				<File
-					RelativePath="..\Source\Core\ElementDocument.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\ElementDocument.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Geometry"
-			>
-			<File
-				RelativePath="..\Source\Core\Geometry.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Geometry.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\GeometryDatabase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\GeometryDatabase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\GeometryUtilities.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\GeometryUtilities.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Vertex.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Decorator"
-			>
-			<File
-				RelativePath="..\Source\Core\Decorator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Decorator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\DecoratorInstancer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\DecoratorInstancer.h"
-				>
-			</File>
-			<Filter
-				Name="Decorators"
-				>
-				<File
-					RelativePath="..\Source\Core\DecoratorNone.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\DecoratorNone.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\DecoratorNoneInstancer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\DecoratorNoneInstancer.h"
-					>
-				</File>
-				<Filter
-					Name="Tile"
-					>
-					<File
-						RelativePath="..\Source\Core\DecoratorTiled.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\Source\Core\DecoratorTiled.h"
-						>
-					</File>
-					<File
-						RelativePath="..\Source\Core\DecoratorTiledInstancer.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\Source\Core\DecoratorTiledInstancer.h"
-						>
-					</File>
-					<Filter
-						Name="Horizontal"
-						>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledHorizontal.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledHorizontal.h"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledHorizontalInstancer.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledHorizontalInstancer.h"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="Box"
-						>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledBox.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledBox.h"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledBoxInstancer.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledBoxInstancer.h"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="Image"
-						>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledImage.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledImage.h"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledImageInstancer.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledImageInstancer.h"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="Vertical"
-						>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledVertical.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledVertical.h"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledVerticalInstancer.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\DecoratorTiledVerticalInstancer.h"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Style Sheet"
-			>
-			<File
-				RelativePath="..\Source\Core\StyleSheet.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\StyleSheet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\StyleSheetFactory.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\StyleSheetFactory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\StyleSheetKeywords.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\StyleSheetNode.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\StyleSheetNode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\StyleSheetParser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\StyleSheetParser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\StyleSheetSpecification.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\StyleSheetSpecification.h"
-				>
-			</File>
-			<Filter
-				Name="Property"
-				>
-				<File
-					RelativePath="..\Source\Core\Property.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Property.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\PropertyDictionary.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\PropertyDictionary.h"
-					>
-				</File>
-				<Filter
-					Name="Definition"
-					>
-					<File
-						RelativePath="..\Source\Core\PropertyDefinition.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\Include\Rocket\Core\PropertyDefinition.h"
-						>
-					</File>
-					<File
-						RelativePath="..\Source\Core\PropertyShorthandDefinition.h"
-						>
-					</File>
-					<File
-						RelativePath="..\Source\Core\PropertySpecification.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\Include\Rocket\Core\PropertySpecification.h"
-						>
-					</File>
-					<Filter
-						Name="Parser"
-						>
-						<File
-							RelativePath="..\Include\Rocket\Core\PropertyParser.h"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\PropertyParserColour.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\PropertyParserColour.h"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\PropertyParserKeyword.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\PropertyParserKeyword.h"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\PropertyParserNumber.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\PropertyParserNumber.h"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\PropertyParserString.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\PropertyParserString.h"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="Selectors"
-				>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelector.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelector.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorEmpty.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorEmpty.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorFirstChild.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorFirstChild.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorFirstOfType.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorFirstOfType.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorLastChild.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorLastChild.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorLastOfType.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorLastOfType.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthChild.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthChild.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthLastChild.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthLastChild.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthLastOfType.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthLastOfType.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthOfType.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthOfType.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorOnlyChild.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorOnlyChild.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorOnlyOfType.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StyleSheetNodeSelectorOnlyOfType.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Events"
-			>
-			<File
-				RelativePath="..\Source\Core\Event.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Event.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\EventDispatcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\EventDispatcher.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\EventInstancer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\EventInstancer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\EventInstancerDefault.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\EventInstancerDefault.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\EventIterators.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\EventListener.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\EventListenerInstancer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\EventListenerInstancer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Input.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Fonts"
-			>
-			<File
-				RelativePath="..\Include\Rocket\Core\Font.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\FontDatabase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\FontDatabase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\FontFace.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\FontFace.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\FontFaceHandle.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\FontFaceHandle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\FontFaceLayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\FontFaceLayer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\FontFamily.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\FontFamily.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\FontGlyph.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\UnicodeRange.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\UnicodeRange.h"
-				>
-			</File>
-			<Filter
-				Name="Texture Layout"
-				>
-				<File
-					RelativePath="..\Source\Core\TextureLayout.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\TextureLayout.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\TextureLayoutRectangle.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\TextureLayoutRectangle.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\TextureLayoutRow.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\TextureLayoutRow.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\TextureLayoutTexture.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\TextureLayoutTexture.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Effect"
-				>
-				<File
-					RelativePath="..\Source\Core\FontEffect.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\FontEffect.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\FontEffectInstancer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\FontEffectInstancer.h"
-					>
-				</File>
-				<Filter
-					Name="Effects"
-					>
-					<Filter
-						Name="None"
-						>
-						<File
-							RelativePath="..\Source\Core\FontEffectNone.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\FontEffectNone.h"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\FontEffectNoneInstancer.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\FontEffectNoneInstancer.h"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="Outline"
-						>
-						<File
-							RelativePath="..\Source\Core\FontEffectOutline.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\FontEffectOutline.h"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\FontEffectOutlineInstancer.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\FontEffectOutlineInstancer.h"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="Shadow"
-						>
-						<File
-							RelativePath="..\Source\Core\FontEffectShadow.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\FontEffectShadow.h"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\FontEffectShadowInstancer.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Source\Core\FontEffectShadowInstancer.h"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="Convolution Filter"
-						>
-						<File
-							RelativePath="..\Source\Core\ConvolutionFilter.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\Include\Rocket\Core\ConvolutionFilter.h"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Templates"
-			>
-			<File
-				RelativePath="..\Source\Core\Template.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\Template.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\TemplateCache.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\TemplateCache.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Core"
-			>
-			<File
-				RelativePath="..\Source\Core\Clock.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\Clock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\Core.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Core.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\Factory.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Factory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Header.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\Log.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Log.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\Math.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Types.h"
-				>
-			</File>
-			<Filter
-				Name="Interfaces"
-				>
-				<Filter
-					Name="Renderer"
-					>
-					<File
-						RelativePath="..\Source\Core\RenderInterface.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\Include\Rocket\Core\RenderInterface.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="File"
-					>
-					<File
-						RelativePath="..\Source\Core\FileInterface.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\Include\Rocket\Core\FileInterface.h"
-						>
-					</File>
-					<File
-						RelativePath="..\Source\Core\FileInterfaceDefault.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\Source\Core\FileInterfaceDefault.h"
-						>
-					</File>
-					<File
-						RelativePath="..\Source\Core\StreamFile.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\Source\Core\StreamFile.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="System"
-					>
-					<File
-						RelativePath="..\Source\Core\SystemInterface.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\Include\Rocket\Core\SystemInterface.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="String"
-				>
-				<File
-					RelativePath="..\Source\Core\String.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\String.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Plugin"
-				>
-				<File
-					RelativePath="..\Source\Core\Plugin.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Plugin.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\PluginRegistry.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\PluginRegistry.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Types"
-				>
-				<File
-					RelativePath="..\Source\Core\BaseXMLParser.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\BaseXMLParser.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Colour.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Colour.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Debug.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\Dictionary.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Dictionary.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Dictionary.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\ReferenceCountable.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\ScriptInterface.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\Stream.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Stream.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StreamMemory.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\StreamMemory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\StringBase.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\StringBase.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StringStorage.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\StringStorage.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\StringUtilities.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\StringUtilities.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\URL.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\URL.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\Variant.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Variant.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Variant.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\Vector2.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Vector2.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\Vector2.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\Source\Core\WString.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Include\Rocket\Core\WString.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Context"
-			>
-			<File
-				RelativePath="..\Source\Core\Context.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ShowIncludes="false"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\Context.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ContextInstancer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Include\Rocket\Core\ContextInstancer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ContextInstancerDefault.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\ContextInstancerDefault.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="String Cache"
-			>
-			<File
-				RelativePath="..\Source\Core\StringCache.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\StringCache.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\Include\Rocket\Core.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="RocketCore"
+	ProjectGUID="{1AAC0B29-AEB9-4E3F-8EDF-B46F8949C41B}"
+	RootNamespace="rocket"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\vsprops\BuildConfigurationDLLDebug.vsprops"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\Include;..\..\support\freetype\include"
+				UsePrecompiledHeader="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="freetype243MT_D.lib"
+				OutputFile="..\bin\$(ProjectName)_d.dll"
+				AdditionalLibraryDirectories="..\..\support\lib"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\vsprops\BuildConfigurationDLLRelease.vsprops"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\Include;..\..\support\freetype\include"
+				UsePrecompiledHeader="2"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="freetype243MT.lib"
+				OutputFile="..\bin\$(ProjectName).dll"
+				AdditionalLibraryDirectories="..\..\support\lib"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Precompiled Header"
+			>
+			<File
+				RelativePath="..\Source\Core\precompiled.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\Source\Core\precompiled.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Texture"
+			>
+			<File
+				RelativePath="..\Source\Core\Texture.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Texture.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\TextureDatabase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\TextureDatabase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\TextureResource.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\TextureResource.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Element"
+			>
+			<File
+				RelativePath="..\Source\Core\Box.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Box.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\DocumentHeader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\DocumentHeader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\Element.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Element.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Element.inl"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ElementBackground.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ElementBackground.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ElementBorder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ElementBorder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ElementDecoration.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ElementDecoration.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ElementReference.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\ElementReference.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ElementScroll.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\ElementScroll.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ElementStyle.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ElementStyle.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ElementUtilities.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\ElementUtilities.h"
+				>
+			</File>
+			<Filter
+				Name="Layout"
+				>
+				<File
+					RelativePath="..\Source\Core\LayoutBlockBox.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\LayoutBlockBox.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\LayoutBlockBoxSpace.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\LayoutBlockBoxSpace.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\LayoutEngine.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\LayoutEngine.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\LayoutInlineBox.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\LayoutInlineBox.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\LayoutInlineBoxText.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\LayoutInlineBoxText.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\LayoutLineBox.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\LayoutLineBox.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Instancer"
+				>
+				<File
+					RelativePath="..\Source\Core\ElementInstancer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\ElementInstancer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\ElementInstancerGeneric.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\ElementInstancerGeneric.inl"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Parser"
+				>
+				<File
+					RelativePath="..\Source\Core\XMLNodeHandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\XMLNodeHandler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\XMLNodeHandlerBody.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\XMLNodeHandlerBody.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\XMLNodeHandlerDefault.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\XMLNodeHandlerDefault.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\XMLNodeHandlerHead.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\XMLNodeHandlerHead.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\XMLNodeHandlerTemplate.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\XMLNodeHandlerTemplate.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\XMLParser.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\XMLParser.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\XMLParseTools.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\XMLParseTools.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Definition"
+				>
+				<File
+					RelativePath="..\Source\Core\ElementDefinition.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\ElementDefinition.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Text"
+				>
+				<File
+					RelativePath="..\Source\Core\ElementText.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\ElementText.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\ElementTextDefault.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\ElementTextDefault.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Handle"
+				>
+				<File
+					RelativePath="..\Source\Core\ElementHandle.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\ElementHandle.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Widgets"
+				>
+				<File
+					RelativePath="..\Source\Core\WidgetSlider.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\WidgetSlider.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\WidgetSliderScroll.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\WidgetSliderScroll.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Image"
+				>
+				<File
+					RelativePath="..\Source\Core\ElementImage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\ElementImage.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Document"
+				>
+				<File
+					RelativePath="..\Source\Core\ElementDocument.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\ElementDocument.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Geometry"
+			>
+			<File
+				RelativePath="..\Source\Core\Geometry.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Geometry.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\GeometryDatabase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\GeometryDatabase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\GeometryUtilities.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\GeometryUtilities.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Vertex.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Decorator"
+			>
+			<File
+				RelativePath="..\Source\Core\Decorator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Decorator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\DecoratorInstancer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\DecoratorInstancer.h"
+				>
+			</File>
+			<Filter
+				Name="Decorators"
+				>
+				<File
+					RelativePath="..\Source\Core\DecoratorNone.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\DecoratorNone.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\DecoratorNoneInstancer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\DecoratorNoneInstancer.h"
+					>
+				</File>
+				<Filter
+					Name="Tile"
+					>
+					<File
+						RelativePath="..\Source\Core\DecoratorTiled.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\Source\Core\DecoratorTiled.h"
+						>
+					</File>
+					<File
+						RelativePath="..\Source\Core\DecoratorTiledInstancer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\Source\Core\DecoratorTiledInstancer.h"
+						>
+					</File>
+					<Filter
+						Name="Horizontal"
+						>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledHorizontal.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledHorizontal.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledHorizontalInstancer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledHorizontalInstancer.h"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Box"
+						>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledBox.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledBox.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledBoxInstancer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledBoxInstancer.h"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Image"
+						>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledImage.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledImage.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledImageInstancer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledImageInstancer.h"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Vertical"
+						>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledVertical.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledVertical.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledVerticalInstancer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\DecoratorTiledVerticalInstancer.h"
+							>
+						</File>
+					</Filter>
+				</Filter>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Style Sheet"
+			>
+			<File
+				RelativePath="..\Source\Core\StyleSheet.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\StyleSheet.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\StyleSheetFactory.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\StyleSheetFactory.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\StyleSheetKeywords.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\StyleSheetNode.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\StyleSheetNode.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\StyleSheetParser.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\StyleSheetParser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\StyleSheetSpecification.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\StyleSheetSpecification.h"
+				>
+			</File>
+			<Filter
+				Name="Property"
+				>
+				<File
+					RelativePath="..\Source\Core\Property.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Property.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\PropertyDictionary.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\PropertyDictionary.h"
+					>
+				</File>
+				<Filter
+					Name="Definition"
+					>
+					<File
+						RelativePath="..\Source\Core\PropertyDefinition.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\Include\Rocket\Core\PropertyDefinition.h"
+						>
+					</File>
+					<File
+						RelativePath="..\Source\Core\PropertyShorthandDefinition.h"
+						>
+					</File>
+					<File
+						RelativePath="..\Source\Core\PropertySpecification.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\Include\Rocket\Core\PropertySpecification.h"
+						>
+					</File>
+					<Filter
+						Name="Parser"
+						>
+						<File
+							RelativePath="..\Include\Rocket\Core\PropertyParser.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\PropertyParserColour.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\PropertyParserColour.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\PropertyParserKeyword.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\PropertyParserKeyword.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\PropertyParserNumber.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\PropertyParserNumber.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\PropertyParserString.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\PropertyParserString.h"
+							>
+						</File>
+					</Filter>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Selectors"
+				>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelector.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelector.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorEmpty.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorEmpty.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorFirstChild.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorFirstChild.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorFirstOfType.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorFirstOfType.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorLastChild.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorLastChild.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorLastOfType.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorLastOfType.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthChild.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthChild.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthLastChild.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthLastChild.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthLastOfType.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthLastOfType.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthOfType.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorNthOfType.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorOnlyChild.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorOnlyChild.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorOnlyOfType.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StyleSheetNodeSelectorOnlyOfType.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Events"
+			>
+			<File
+				RelativePath="..\Source\Core\Event.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Event.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\EventDispatcher.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\EventDispatcher.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\EventInstancer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\EventInstancer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\EventInstancerDefault.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\EventInstancerDefault.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\EventIterators.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\EventListener.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\EventListenerInstancer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\EventListenerInstancer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Input.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Fonts"
+			>
+			<File
+				RelativePath="..\Include\Rocket\Core\Font.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\FontDatabase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\FontDatabase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\FontFace.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\FontFace.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\FontFaceHandle.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\FontFaceHandle.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\FontFaceLayer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\FontFaceLayer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\FontFamily.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\FontFamily.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\FontGlyph.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\UnicodeRange.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\UnicodeRange.h"
+				>
+			</File>
+			<Filter
+				Name="Texture Layout"
+				>
+				<File
+					RelativePath="..\Source\Core\TextureLayout.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\TextureLayout.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\TextureLayoutRectangle.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\TextureLayoutRectangle.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\TextureLayoutRow.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\TextureLayoutRow.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\TextureLayoutTexture.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\TextureLayoutTexture.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Effect"
+				>
+				<File
+					RelativePath="..\Source\Core\FontEffect.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\FontEffect.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\FontEffectInstancer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\FontEffectInstancer.h"
+					>
+				</File>
+				<Filter
+					Name="Effects"
+					>
+					<Filter
+						Name="None"
+						>
+						<File
+							RelativePath="..\Source\Core\FontEffectNone.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\FontEffectNone.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\FontEffectNoneInstancer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\FontEffectNoneInstancer.h"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Outline"
+						>
+						<File
+							RelativePath="..\Source\Core\FontEffectOutline.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\FontEffectOutline.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\FontEffectOutlineInstancer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\FontEffectOutlineInstancer.h"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Shadow"
+						>
+						<File
+							RelativePath="..\Source\Core\FontEffectShadow.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\FontEffectShadow.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\FontEffectShadowInstancer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Source\Core\FontEffectShadowInstancer.h"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Convolution Filter"
+						>
+						<File
+							RelativePath="..\Source\Core\ConvolutionFilter.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\Include\Rocket\Core\ConvolutionFilter.h"
+							>
+						</File>
+					</Filter>
+				</Filter>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Templates"
+			>
+			<File
+				RelativePath="..\Source\Core\Template.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\Template.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\TemplateCache.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\TemplateCache.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Core"
+			>
+			<File
+				RelativePath="..\Source\Core\Clock.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\Clock.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\Core.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Core.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\Factory.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Factory.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Header.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\Log.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Log.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\Math.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Types.h"
+				>
+			</File>
+			<Filter
+				Name="Interfaces"
+				>
+				<Filter
+					Name="Renderer"
+					>
+					<File
+						RelativePath="..\Source\Core\RenderInterface.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\Include\Rocket\Core\RenderInterface.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="File"
+					>
+					<File
+						RelativePath="..\Source\Core\FileInterface.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\Include\Rocket\Core\FileInterface.h"
+						>
+					</File>
+					<File
+						RelativePath="..\Source\Core\FileInterfaceDefault.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\Source\Core\FileInterfaceDefault.h"
+						>
+					</File>
+					<File
+						RelativePath="..\Source\Core\StreamFile.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\Source\Core\StreamFile.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="System"
+					>
+					<File
+						RelativePath="..\Source\Core\SystemInterface.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\Include\Rocket\Core\SystemInterface.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="String"
+				>
+				<File
+					RelativePath="..\Source\Core\String.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\String.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Plugin"
+				>
+				<File
+					RelativePath="..\Source\Core\Plugin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Plugin.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\PluginRegistry.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\PluginRegistry.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Types"
+				>
+				<File
+					RelativePath="..\Source\Core\BaseXMLParser.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\BaseXMLParser.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Colour.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Colour.inl"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Debug.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\Dictionary.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Dictionary.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Dictionary.inl"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\ReferenceCountable.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\ScriptInterface.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\Stream.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Stream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StreamMemory.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\StreamMemory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\StringBase.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\StringBase.inl"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\StringUtilities.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\StringUtilities.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\URL.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\URL.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\Variant.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Variant.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Variant.inl"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\Vector2.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Vector2.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\Vector2.inl"
+					>
+				</File>
+				<File
+					RelativePath="..\Source\Core\WString.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Include\Rocket\Core\WString.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Context"
+			>
+			<File
+				RelativePath="..\Source\Core\Context.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ShowIncludes="false"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\Context.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ContextInstancer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\Rocket\Core\ContextInstancer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ContextInstancerDefault.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\ContextInstancerDefault.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="String Cache"
+			>
+			<File
+				RelativePath="..\Source\Core\StringCache.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Core\StringCache.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\Include\Rocket\Core.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Build/cmake/FileList.cmake

@@ -91,7 +91,6 @@ set(Core_HDR_FILES
 
 set(Core_PUB_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/FontEffect.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/StringStorage.h
     ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/TypeConverter.h
     ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ElementScroll.h
     ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/SystemInterface.h
@@ -255,7 +254,6 @@ set(Core_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Source/Core/DecoratorTiledImage.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/EventInstancer.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/TextureLayoutRow.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/StringStorage.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/PropertySpecification.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/FontFaceHandle.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/SystemInterface.cpp

Samples/invaders/RocketInvaders.vcproj

@@ -1,366 +1,366 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="RocketInvaders"
-	ProjectGUID="{3C58D3B5-9478-4221-954A-01E3C4F1FA89}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ProjectDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\shell\include;..\..\Include"
-				PreprocessorDefinitions="WIN32"
-				RuntimeLibrary="3"
-				WarningLevel="4"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="RocketCore_d.lib RocketDebugger_d.lib RocketControls_d.lib opengl32.lib"
-				OutputFile="$(ProjectName)_d.exe"
-				AdditionalLibraryDirectories="..\shell\libpng; ..\..\bin"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\shell\include;..\..\Include"
-				PreprocessorDefinitions="WIN32"
-				RuntimeLibrary="2"
-				WarningLevel="4"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="RocketCore.lib RocketDebugger.lib RocketControls.lib opengl32.lib"
-				OutputFile="$(ProjectName).exe"
-				AdditionalLibraryDirectories="..\shell\libpng; ..\..\bin"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Event"
-			>
-			<File
-				RelativePath=".\src\Event.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Event.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\EventHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\EventHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\EventInstancer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\EventInstancer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\EventManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\EventManager.h"
-				>
-			</File>
-			<Filter
-				Name="Event Handlers"
-				>
-				<File
-					RelativePath=".\src\EventHandlerHighScore.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\EventHandlerHighScore.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\EventHandlerOptions.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\EventHandlerOptions.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\EventHandlerStartGame.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\EventHandlerStartGame.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Game"
-			>
-			<File
-				RelativePath=".\src\Defender.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Defender.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\ElementGame.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\ElementGame.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Game.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Game.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\GameDetails.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\GameDetails.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Invader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Invader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Mothership.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Mothership.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Shield.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Shield.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Sprite.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\Sprite.h"
-				>
-			</File>
-			<Filter
-				Name="High Scores"
-				>
-				<File
-					RelativePath=".\src\DecoratorDefender.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\DecoratorDefender.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\DecoratorInstancerDefender.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\DecoratorInstancerDefender.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\HighScores.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\HighScores.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\HighScoresNameFormatter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\HighScoresNameFormatter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\HighScoresShipFormatter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\HighScoresShipFormatter.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Starfield"
-			>
-			<File
-				RelativePath=".\src\DecoratorInstancerStarfield.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\DecoratorInstancerStarfield.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\DecoratorStarfield.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\DecoratorStarfield.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\src\main.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="RocketInvaders"
+	ProjectGUID="{3C58D3B5-9478-4221-954A-01E3C4F1FA89}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ProjectDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\shell\include;..\..\Include"
+				PreprocessorDefinitions="WIN32"
+				RuntimeLibrary="3"
+				WarningLevel="4"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="RocketCore_d.lib RocketDebugger_d.lib RocketControls_d.lib opengl32.lib"
+				OutputFile="..\..\bin\$(ProjectName)_d.exe"
+				AdditionalLibraryDirectories="..\shell\libpng; ..\..\bin"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+				EmbedManifest="true"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ProjectDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\shell\include;..\..\Include"
+				PreprocessorDefinitions="WIN32"
+				RuntimeLibrary="2"
+				WarningLevel="4"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="RocketCore.lib RocketDebugger.lib RocketControls.lib opengl32.lib"
+				OutputFile="..\..\bin\$(ProjectName).exe"
+				AdditionalLibraryDirectories="..\shell\libpng; ..\..\bin"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Event"
+			>
+			<File
+				RelativePath=".\src\Event.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Event.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\EventHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\EventHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\EventInstancer.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\EventInstancer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\EventManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\EventManager.h"
+				>
+			</File>
+			<Filter
+				Name="Event Handlers"
+				>
+				<File
+					RelativePath=".\src\EventHandlerHighScore.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\EventHandlerHighScore.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\EventHandlerOptions.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\EventHandlerOptions.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\EventHandlerStartGame.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\EventHandlerStartGame.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Game"
+			>
+			<File
+				RelativePath=".\src\Defender.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Defender.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ElementGame.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ElementGame.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Game.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Game.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\GameDetails.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\GameDetails.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Invader.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Invader.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Mothership.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Mothership.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Shield.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Shield.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Sprite.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Sprite.h"
+				>
+			</File>
+			<Filter
+				Name="High Scores"
+				>
+				<File
+					RelativePath=".\src\DecoratorDefender.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\DecoratorDefender.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\DecoratorInstancerDefender.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\DecoratorInstancerDefender.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\HighScores.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\HighScores.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\HighScoresNameFormatter.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\HighScoresNameFormatter.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\HighScoresShipFormatter.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\HighScoresShipFormatter.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Starfield"
+			>
+			<File
+				RelativePath=".\src\DecoratorInstancerStarfield.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\DecoratorInstancerStarfield.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\DecoratorStarfield.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\DecoratorStarfield.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\src\main.cpp"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>