aboutsummaryrefslogtreecommitdiff
path: root/dists
diff options
context:
space:
mode:
authorVicent Marti2008-10-09 11:49:35 +0000
committerVicent Marti2008-10-09 11:49:35 +0000
commit1f2ce8b1881078b3de82b63f8ecdc1777f4ab9d1 (patch)
tree3b454a1b1e0dca09eada21287ed7b7e8a7cf4226 /dists
parent5dd381932f3ed501a27fe97f48ef30331b2924d5 (diff)
parent000eedb0737dbe400d016edf213928dbb1a227d3 (diff)
downloadscummvm-rg350-1f2ce8b1881078b3de82b63f8ecdc1777f4ab9d1.tar.gz
scummvm-rg350-1f2ce8b1881078b3de82b63f8ecdc1777f4ab9d1.tar.bz2
scummvm-rg350-1f2ce8b1881078b3de82b63f8ecdc1777f4ab9d1.zip
Manual merge of the GSoC2008 GUI branch. (71 files)
svn-id: r34757
Diffstat (limited to 'dists')
-rw-r--r--dists/msvc9/scummvm.vcproj75
1 files changed, 54 insertions, 21 deletions
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index 06545097f6..09b496b087 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="scummvm"
ProjectGUID="{8434CB15-D08F-427D-9E6D-581AE5B28440}"
RootNamespace="scummvm"
@@ -103,9 +103,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -200,9 +197,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -470,6 +464,14 @@
>
</File>
<File
+ RelativePath="..\..\common\xmlparser.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\common\xmlparser.h"
+ >
+ </File>
+ <File
RelativePath="..\..\common\zlib.cpp"
>
</File>
@@ -1117,14 +1119,6 @@
>
</File>
<File
- RelativePath="..\..\gui\eval.cpp"
- >
- </File>
- <File
- RelativePath="..\..\gui\eval.h"
- >
- </File>
- <File
RelativePath="..\..\gui\Key.cpp"
>
</File>
@@ -1213,10 +1207,6 @@
>
</File>
<File
- RelativePath="..\..\gui\theme-config.cpp"
- >
- </File>
- <File
RelativePath="..\..\gui\theme.cpp"
>
</File>
@@ -1233,14 +1223,41 @@
>
</File>
<File
- RelativePath="..\..\gui\ThemeClassic.cpp"
+ RelativePath="..\..\gui\ThemeEngine.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gui\ThemeEngine.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gui\ThemeEval.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gui\ThemeLayout.cpp"
>
</File>
<File
- RelativePath="..\..\gui\ThemeModern.cpp"
+ RelativePath="..\..\gui\ThemeLayout.h"
>
</File>
<File
+ RelativePath="..\..\gui\ThemeParser.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gui\ThemeParser.h"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\gui\widget.cpp"
>
</File>
@@ -1345,6 +1362,22 @@
>
</File>
<File
+ RelativePath="..\..\graphics\VectorRenderer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\graphics\VectorRenderer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\graphics\VectorRendererSpec.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\graphics\VectorRendererSpec.h"
+ >
+ </File>
+ <File
RelativePath="..\..\graphics\thumbnail.cpp"
>
</File>