Bug fixes and header licenses

libRocket · Sep 9, 2010 · 09b9364 · 09b9364
1 parent 0199dd0
commit 09b9364
Show file tree

Hide file tree

Showing 274 changed files with 9,346 additions and 5,896 deletions.
diff --git a/Build/RocketControls.vcproj b/Build/RocketControls.vcproj
@@ -19,7 +19,6 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(IntDir)"
-			IntermediateDirectory="build\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets=".\vsprops\BuildConfigurationDLLDebug.vsprops"
 			CharacterSet="1"
@@ -87,7 +86,6 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(IntDir)"
-			IntermediateDirectory="build\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets=".\vsprops\BuildConfigurationDLLRelease.vsprops"
 			CharacterSet="1"

diff --git a/Build/RocketControlsPython.vcproj b/Build/RocketControlsPython.vcproj
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="RocketControlsPython"
+	ProjectGUID="{206AC8CC-432B-4B7C-C497-2CF315AEE1C1}"
+	RootNamespace="core"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\vsprops\BuildConfigurationDLLDebug.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\include\;..\Source\Core;..\..\support\boost\;..\..\support\python\include\;..\..\support\python\PC"
+				WarningLevel="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="RocketCore_d.lib RocketControls_d.lib python27_d.lib boost_python-vc90-mt-gyd-1_44.lib"
+				OutputFile="..\bin\_rocketcontrols_d.pyd"
+				AdditionalLibraryDirectories="..\bin;..\..\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"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\include\;..\Source\Core;..\..\support\boost\;..\..\support\python\include\;..\..\support\python\PC"
+				WarningLevel="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="RocketCore.lib RocketControls.lib python27.lib boost_python-vc90-mt-1_44.lib"
+				OutputFile="..\bin\_rocketcontrols.pyd"
+				AdditionalLibraryDirectories="..\bin;..\..\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="Elements"
+			>
+			<File
+				RelativePath="..\Source\Controls\Python\DataGridRowProxy.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Controls\Python\DataGridRowProxy.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Controls\Python\ElementInterface.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Controls\Python\ElementInterface.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Controls\Python\SelectOptionProxy.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Controls\Python\SelectOptionProxy.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Precompiled Header"
+			>
+			<File
+				RelativePath="..\Source\Controls\Python\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\Controls\Python\precompiled.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="DataSource"
+			>
+			<File
+				RelativePath="..\Source\Controls\Python\DataFormatterWrapper.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Controls\Python\DataFormatterWrapper.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Controls\Python\DataSourceWrapper.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Controls\Python\DataSourceWrapper.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\Source\Controls\Python\Module.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Controls\Python\Module.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Build/RocketCore.vcproj b/Build/RocketCore.vcproj
@@ -19,7 +19,6 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="build\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets=".\vsprops\BuildConfigurationDLLDebug.vsprops"
 			CharacterSet="1"
@@ -42,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\Include;..\..\support\freetype\include"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -85,7 +84,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			IntermediateDirectory="build\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets=".\vsprops\BuildConfigurationDLLRelease.vsprops"
 			CharacterSet="1"
@@ -109,7 +107,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\Include;..\..\support\freetype\include"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -160,12 +158,20 @@
 			<File
 				RelativePath="..\Source\Core\precompiled.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
+						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1182,22 +1188,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Trial"
-			>
-			<File
-				RelativePath="..\Source\Core\TrialLogo.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\TrialLogo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\Core\TrialLogoTexture.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Core"
 			>
@@ -1436,6 +1426,18 @@
 					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"
 					>