diff options
| author | Christopher Page | 2008-06-16 19:06:48 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-06-16 19:06:48 +0000 |
| commit | 37a7a572cff7c3648f23fab42d45e98c21942d20 (patch) | |
| tree | 84ae8cd418276d6531ba9a0ad19c8e5286105c84 /dists | |
| parent | 7009aae8930835221677e71f085841abf66c0151 (diff) | |
| parent | bc01acd18f6a0fae36497826d3a21baf3fec958d (diff) | |
| download | scummvm-rg350-37a7a572cff7c3648f23fab42d45e98c21942d20.tar.gz scummvm-rg350-37a7a572cff7c3648f23fab42d45e98c21942d20.tar.bz2 scummvm-rg350-37a7a572cff7c3648f23fab42d45e98c21942d20.zip | |
Merged revisions 32668-32669,32676,32687-32689,32693,32695,32698-32701,32705 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r32720
Diffstat (limited to 'dists')
| -rw-r--r-- | dists/msvc7/scummvm.vcproj | 5 | ||||
| -rw-r--r-- | dists/msvc71/scummvm.vcproj | 5 | ||||
| -rw-r--r-- | dists/msvc8/scummvm.vcproj | 6 | ||||
| -rw-r--r-- | dists/msvc9/scummvm.vcproj | 6 |
4 files changed, 18 insertions, 4 deletions
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj index 89cb1ff697..befbdd8e31 100644 --- a/dists/msvc7/scummvm.vcproj +++ b/dists/msvc7/scummvm.vcproj @@ -396,7 +396,10 @@ RelativePath="..\..\sound\midiparser_xmidi.cpp"> </File> <File - RelativePath="..\..\sound\midiplugin.h"> + RelativePath="..\..\sound\musicplugin.cpp"> + </File> + <File + RelativePath="..\..\sound\musicplugin.h"> </File> <File RelativePath="..\..\sound\mixer.cpp"> diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj index 08102bd9b2..bc363a67fd 100644 --- a/dists/msvc71/scummvm.vcproj +++ b/dists/msvc71/scummvm.vcproj @@ -410,7 +410,10 @@ RelativePath="..\..\sound\midiparser_xmidi.cpp"> </File> <File - RelativePath="..\..\sound\midiplugin.h"> + RelativePath="..\..\sound\musicplugin.cpp"> + </File> + <File + RelativePath="..\..\sound\musicplugin.h"> </File> <File RelativePath="..\..\sound\mixer.cpp"> diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj index 3dcaf09f83..2d047bbd1b 100644 --- a/dists/msvc8/scummvm.vcproj +++ b/dists/msvc8/scummvm.vcproj @@ -565,7 +565,11 @@ > </File> <File - RelativePath="..\..\sound\midiplugin.h" + RelativePath="..\..\sound\musicplugin.cpp" + > + </File> + <File + RelativePath="..\..\sound\musicplugin.h" > </File> <File diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj index daf6ae6c99..bd6b5af75c 100644 --- a/dists/msvc9/scummvm.vcproj +++ b/dists/msvc9/scummvm.vcproj @@ -570,7 +570,11 @@ > </File> <File - RelativePath="..\..\sound\midiplugin.h" + RelativePath="..\..\sound\musicplugin.cpp" + > + </File> + <File + RelativePath="..\..\sound\musicplugin.h" > </File> <File |