diff options
author | Max Horn | 2008-05-06 15:21:46 +0000 |
---|---|---|
committer | Max Horn | 2008-05-06 15:21:46 +0000 |
commit | ba6c4a6239d5496f0f218d8fa76c11e77bf9139e (patch) | |
tree | 8c7c9d3d32b38e8ddd10499ab10e2b63b5eb8f36 /dists/msvc9/kyra.vcproj | |
parent | 4331411ebea61072ff0189d7d61ac57199a120af (diff) | |
parent | 397e04d0b1ff6d96502c4eca42c1ab4a31b2dbcd (diff) | |
download | scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.gz scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.bz2 scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.zip |
Merge with trunk, using the svnmerge tool
svn-id: r31898
Diffstat (limited to 'dists/msvc9/kyra.vcproj')
-rw-r--r-- | dists/msvc9/kyra.vcproj | 124 |
1 files changed, 88 insertions, 36 deletions
diff --git a/dists/msvc9/kyra.vcproj b/dists/msvc9/kyra.vcproj index 833ee4cc13..b004e9463e 100644 --- a/dists/msvc9/kyra.vcproj +++ b/dists/msvc9/kyra.vcproj @@ -162,19 +162,23 @@ </References> <Files> <File - RelativePath="..\..\engines\kyra\animator_v1.cpp" + RelativePath="..\..\engines\kyra\animator_hof.cpp" > </File> <File - RelativePath="..\..\engines\kyra\animator_v1.h" + RelativePath="..\..\engines\kyra\animator_mr.cpp" > </File> <File - RelativePath="..\..\engines\kyra\animator_v2.cpp" + RelativePath="..\..\engines\kyra\animator_v1.cpp" + > + </File> + <File + RelativePath="..\..\engines\kyra\animator_v1.h" > </File> <File - RelativePath="..\..\engines\kyra\animator_v3.cpp" + RelativePath="..\..\engines\kyra\animator_v2.cpp" > </File> <File @@ -198,6 +202,22 @@ > </File> <File + RelativePath="..\..\engines\kyra\gui_hof.cpp" + > + </File> + <File + RelativePath="..\..\engines\kyra\gui_hof.h" + > + </File> + <File + RelativePath="..\..\engines\kyra\gui_mr.cpp" + > + </File> + <File + RelativePath="..\..\engines\kyra\gui_mr.h" + > + </File> + <File RelativePath="..\..\engines\kyra\gui_v1.cpp" > </File> @@ -214,19 +234,19 @@ > </File> <File - RelativePath="..\..\engines\kyra\gui_v3.cpp" + RelativePath="..\..\engines\kyra\items_hof.cpp" > </File> <File - RelativePath="..\..\engines\kyra\items_v1.cpp" + RelativePath="..\..\engines\kyra\items_mr.cpp" > </File> <File - RelativePath="..\..\engines\kyra\items_v2.cpp" + RelativePath="..\..\engines\kyra\items_v1.cpp" > </File> <File - RelativePath="..\..\engines\kyra\items_v3.cpp" + RelativePath="..\..\engines\kyra\items_v2.cpp" > </File> <File @@ -238,6 +258,22 @@ > </File> <File + RelativePath="..\..\engines\kyra\kyra_hof.cpp" + > + </File> + <File + RelativePath="..\..\engines\kyra\kyra_hof.h" + > + </File> + <File + RelativePath="..\..\engines\kyra\kyra_mr.cpp" + > + </File> + <File + RelativePath="..\..\engines\kyra\kyra_mr.h" + > + </File> + <File RelativePath="..\..\engines\kyra\kyra_v1.cpp" > </File> @@ -254,23 +290,23 @@ > </File> <File - RelativePath="..\..\engines\kyra\kyra_v3.cpp" + RelativePath="..\..\engines\kyra\resource.cpp" > </File> <File - RelativePath="..\..\engines\kyra\kyra_v3.h" + RelativePath="..\..\engines\kyra\resource.h" > </File> <File - RelativePath="..\..\engines\kyra\resource.cpp" + RelativePath="..\..\engines\kyra\saveload.cpp" > </File> <File - RelativePath="..\..\engines\kyra\resource.h" + RelativePath="..\..\engines\kyra\saveload_hof.cpp" > </File> <File - RelativePath="..\..\engines\kyra\saveload.cpp" + RelativePath="..\..\engines\kyra\saveload_mr.cpp" > </File> <File @@ -278,23 +314,23 @@ > </File> <File - RelativePath="..\..\engines\kyra\saveload_v2.cpp" + RelativePath="..\..\engines\kyra\scene.cpp" > </File> <File - RelativePath="..\..\engines\kyra\scene.cpp" + RelativePath="..\..\engines\kyra\scene_hof.cpp" > </File> <File - RelativePath="..\..\engines\kyra\scene_v1.cpp" + RelativePath="..\..\engines\kyra\scene_mr.cpp" > </File> <File - RelativePath="..\..\engines\kyra\scene_v2.cpp" + RelativePath="..\..\engines\kyra\scene_v1.cpp" > </File> <File - RelativePath="..\..\engines\kyra\scene_v3.cpp" + RelativePath="..\..\engines\kyra\scene_v2.cpp" > </File> <File @@ -306,6 +342,22 @@ > </File> <File + RelativePath="..\..\engines\kyra\screen_hof.cpp" + > + </File> + <File + RelativePath="..\..\engines\kyra\screen_hof.h" + > + </File> + <File + RelativePath="..\..\engines\kyra\screen_mr.cpp" + > + </File> + <File + RelativePath="..\..\engines\kyra\screen_mr.h" + > + </File> + <File RelativePath="..\..\engines\kyra\screen_v1.cpp" > </File> @@ -322,19 +374,19 @@ > </File> <File - RelativePath="..\..\engines\kyra\screen_v3.cpp" + RelativePath="..\..\engines\kyra\script.cpp" > </File> <File - RelativePath="..\..\engines\kyra\screen_v3.h" + RelativePath="..\..\engines\kyra\script.h" > </File> <File - RelativePath="..\..\engines\kyra\script.cpp" + RelativePath="..\..\engines\kyra\script_hof.cpp" > </File> <File - RelativePath="..\..\engines\kyra\script.h" + RelativePath="..\..\engines\kyra\script_mr.cpp" > </File> <File @@ -354,27 +406,27 @@ > </File> <File - RelativePath="..\..\engines\kyra\script_v3.cpp" + RelativePath="..\..\engines\kyra\seqplayer.cpp" > </File> <File - RelativePath="..\..\engines\kyra\seqplayer.cpp" + RelativePath="..\..\engines\kyra\seqplayer.h" > </File> <File - RelativePath="..\..\engines\kyra\seqplayer.h" + RelativePath="..\..\engines\kyra\sequences_hof.cpp" > </File> <File - RelativePath="..\..\engines\kyra\sequences_v1.cpp" + RelativePath="..\..\engines\kyra\sequences_mr.cpp" > </File> <File - RelativePath="..\..\engines\kyra\sequences_v2.cpp" + RelativePath="..\..\engines\kyra\sequences_v1.cpp" > </File> <File - RelativePath="..\..\engines\kyra\sequences_v3.cpp" + RelativePath="..\..\engines\kyra\sequences_v2.cpp" > </File> <File @@ -422,23 +474,23 @@ > </File> <File - RelativePath="..\..\engines\kyra\text_v1.cpp" + RelativePath="..\..\engines\kyra\text_hof.cpp" > </File> <File - RelativePath="..\..\engines\kyra\text_v2.cpp" + RelativePath="..\..\engines\kyra\text_hof.h" > </File> <File - RelativePath="..\..\engines\kyra\text_v2.h" + RelativePath="..\..\engines\kyra\text_mr.cpp" > </File> <File - RelativePath="..\..\engines\kyra\text_v3.cpp" + RelativePath="..\..\engines\kyra\text_mr.h" > </File> <File - RelativePath="..\..\engines\kyra\text_v3.h" + RelativePath="..\..\engines\kyra\text_v1.cpp" > </File> <File @@ -450,15 +502,15 @@ > </File> <File - RelativePath="..\..\engines\kyra\timer_v1.cpp" + RelativePath="..\..\engines\kyra\timer_hof.cpp" > </File> <File - RelativePath="..\..\engines\kyra\timer_v2.cpp" + RelativePath="..\..\engines\kyra\timer_mr.cpp" > </File> <File - RelativePath="..\..\engines\kyra\timer_v3.cpp" + RelativePath="..\..\engines\kyra\timer_v1.cpp" > </File> <File |