diff options
Diffstat (limited to 'dists')
-rw-r--r-- | dists/macosx/DS_Store | bin | 12292 -> 12292 bytes | |||
-rw-r--r-- | dists/macosx/Info.plist | 8 | ||||
-rw-r--r-- | dists/msvc71/agi.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc71/scummvm.vcproj | 12 | ||||
-rw-r--r-- | dists/msvc8/agi.vcproj | 8 | ||||
-rw-r--r-- | dists/msvc8/lure.vcproj | 32 | ||||
-rw-r--r-- | dists/msvc8/scummvm.vcproj | 10 | ||||
-rw-r--r-- | dists/redhat/scummvm-tools.spec | 9 | ||||
-rw-r--r-- | dists/redhat/scummvm.spec | 28 | ||||
-rw-r--r-- | dists/redhat/scummvm.spec.in | 26 | ||||
-rw-r--r-- | dists/scummvm.rc | 8 | ||||
-rwxr-xr-x | dists/slackware/scummvm.SlackBuild | 5 |
12 files changed, 106 insertions, 46 deletions
diff --git a/dists/macosx/DS_Store b/dists/macosx/DS_Store Binary files differindex 52267caacd..f6be3b3d8c 100644 --- a/dists/macosx/DS_Store +++ b/dists/macosx/DS_Store diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist index dfd259bb8d..d1396a54d2 100644 --- a/dists/macosx/Info.plist +++ b/dists/macosx/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>scummvm</string> <key>CFBundleGetInfoString</key> - <string>0.10.0svn, Copyright 2001-2006 The ScummVM team</string> + <string>0.11.0svn, Copyright 2001-2007 The ScummVM team</string> <key>CFBundleIconFile</key> <string>scummvm.icns</string> <key>CFBundleIdentifier</key> @@ -21,12 +21,12 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.10.0svn</string> + <string>0.11.0svn</string> <key>CFBundleVersion</key> - <string>0.10.0svn</string> + <string>0.11.0svn</string> <key>NSPrincipalClass</key> <string>NSApplication</string> <key>NSHumanReadableCopyright</key> - <string>Copyright 2001-2006 The ScummVM team</string> + <string>Copyright 2001-2007 The ScummVM team</string> </dict> </plist> diff --git a/dists/msvc71/agi.vcproj b/dists/msvc71/agi.vcproj index 1995554ac2..a738eea3fa 100644 --- a/dists/msvc71/agi.vcproj +++ b/dists/msvc71/agi.vcproj @@ -231,6 +231,12 @@ RelativePath="..\..\engines\agi\view.h"> </File> <File + RelativePath="..\..\engines\agi\wagparser.cpp"> + </File> + <File + RelativePath="..\..\engines\agi\wagparser.h"> + </File> + <File RelativePath="..\..\engines\agi\words.cpp"> </File> </Files> diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj index d198329046..fb18d9b326 100644 --- a/dists/msvc71/scummvm.vcproj +++ b/dists/msvc71/scummvm.vcproj @@ -179,6 +179,9 @@ RelativePath="..\..\common\advancedDetector.h"> </File> <File + RelativePath="..\..\common\algorithm.h"> + </File> + <File RelativePath="..\..\common\array.h"> </File> <File @@ -197,6 +200,9 @@ RelativePath="..\..\common\endian.h"> </File> <File + RelativePath="..\..\common\events.h"> + </File> + <File RelativePath="..\..\common\file.cpp"> </File> <File @@ -239,6 +245,9 @@ RelativePath="..\..\common\mutex.h"> </File> <File + RelativePath="..\..\common\noncopyable.h"> + </File> + <File RelativePath="..\..\common\pack-end.h"> </File> <File @@ -422,6 +431,9 @@ <File RelativePath="..\..\sound\softsynth\ym2612.cpp"> </File> + <File + RelativePath="..\..\sound\softsynth\ym2612.h"> + </File> <Filter Name="mt32" Filter=""> diff --git a/dists/msvc8/agi.vcproj b/dists/msvc8/agi.vcproj index c858028554..a90932df70 100644 --- a/dists/msvc8/agi.vcproj +++ b/dists/msvc8/agi.vcproj @@ -321,6 +321,14 @@ > </File> <File + RelativePath="..\..\engines\agi\wagparser.cpp" + > + </File> + <File + RelativePath="..\..\engines\agi\wagparser.h" + > + </File> + <File RelativePath="..\..\engines\agi\words.cpp" > </File> diff --git a/dists/msvc8/lure.vcproj b/dists/msvc8/lure.vcproj index 74f03c39c9..b125ba686e 100644 --- a/dists/msvc8/lure.vcproj +++ b/dists/msvc8/lure.vcproj @@ -169,22 +169,6 @@ > </File> <File - RelativePath="..\..\engines\lure\debug-input.cpp" - > - </File> - <File - RelativePath="..\..\engines\lure\debug-input.h" - > - </File> - <File - RelativePath="..\..\engines\lure\debug-methods.cpp" - > - </File> - <File - RelativePath="..\..\engines\lure\debug-methods.h" - > - </File> - <File RelativePath="..\..\engines\lure\debugger.cpp" > </File> @@ -221,6 +205,14 @@ > </File> <File + RelativePath="..\..\engines\lure\fights.cpp" + > + </File> + <File + RelativePath="..\..\engines\lure\fights.h" + > + </File> + <File RelativePath="..\..\engines\lure\game.cpp" > </File> @@ -321,6 +313,14 @@ > </File> <File + RelativePath="..\..\engines\lure\sound.cpp" + > + </File> + <File + RelativePath="..\..\engines\lure\sound.h" + > + </File> + <File RelativePath="..\..\engines\lure\strings.cpp" > </File> diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj index 01747e836c..2f59d57b18 100644 --- a/dists/msvc8/scummvm.vcproj +++ b/dists/msvc8/scummvm.vcproj @@ -75,8 +75,8 @@ GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/scummvm.pdb" SubSystem="1" - TargetMachine="1" EntryPointSymbol="WinMainCRTStartup" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -327,6 +327,10 @@ > </File> <File + RelativePath="..\..\common\keyboard.h" + > + </File> + <File RelativePath="..\..\common\list.h" > </File> @@ -665,6 +669,10 @@ /> </FileConfiguration> </File> + <File + RelativePath="..\..\sound\softsynth\ym2612.h" + > + </File> <Filter Name="mt32" > diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec index e415bac63f..dc09987061 100644 --- a/dists/redhat/scummvm-tools.spec +++ b/dists/redhat/scummvm-tools.spec @@ -7,7 +7,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm-tools -Version : 0.10.0svn +Version : 0.11.0svn Release : 1 Summary : ScummVM-related tools Group : Interpreters @@ -33,12 +33,14 @@ Tools for compressing ScummVM datafiles and other related tools. %build make +echo -e "\t\tThis script is installed as\n\t\t"%{_datadir}/scummvm-tools/convert_dxa.sh.sample >> README %install install -m755 -D encode_dxa %{buildroot}%{_bindir}/encode_dxa -install -m755 -D compress_{queen,saga,scumm_san,scumm_sou,scumm_bun,simon,sword1,sword2,kyra} %{buildroot}%{_bindir} +install -m755 -D compress_{agos,kyra,queen,saga,scumm_bun,scumm_san,scumm_sou,sword1,sword2,touche} %{buildroot}%{_bindir} install -m755 -D de{kyra,scumm,sword2} %{buildroot}%{_bindir} -install -m755 -D extract_{kyra,loom_tg16,mm_nes,mm_c64,zak_c64,scumm_mac,simon1_amiga} %{buildroot}%{_bindir} +install -m755 -D extract_{agos,kyra,loom_tg16,mm_apple,mm_c64,mm_nes,scumm_mac,zak_c64} %{buildroot}%{_bindir} +install -m644 -D convert_dxa.sh %{buildroot}%{_datadir}/scummvm-tools/convert_dxa.sh.sample %clean rm -Rf ${RPM_BUILD_ROOT} @@ -52,6 +54,7 @@ rm -Rf ${RPM_BUILD_ROOT} %attr(0755,root,root)%{_bindir}/de* %attr(0755,root,root)%{_bindir}/extract_* %attr(0755,root,root)%{_bindir}/encode_dxa +%attr(0644,root,root)%{_datadir}/scummvm-tools/convert_dxa.sh.sample #------------------------------------------------------------------------------ # Change Log diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec index 44904c68d9..b17243f3c4 100644 --- a/dists/redhat/scummvm.spec +++ b/dists/redhat/scummvm.spec @@ -7,7 +7,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm -Version : 0.10.0svn +Version : 0.11.0svn Release : 1 Summary : Graphic adventure game interpreter Group : Interpreters @@ -17,7 +17,10 @@ Url : http://www.scummvm.org Source : %{name}-%{version}.tar.bz2 Source1 : libmad-0.15.1b.tar.bz2 -Source2 : mpeg2dec-0.4.0b.tar.bz2 +Source2 : mpeg2dec-0.4.1.tar.bz2 +Source3 : kyra.dat +Source4 : queen.tbl +Source5 : sky.cpt BuildRoot : %{_tmppath}/%{name}-%{version}-root BuildRequires: desktop-file-utils @@ -34,11 +37,12 @@ BuildRequires: SDL-devel >= 1.2.2 %description ScummVM is an interpreter that will play graphic adventure games written for LucasArts' SCUMM virtual machine (such as Day of the Tentacle and -Monkey Island), Adventure Soft's Simon the Sorcerer 1, 2 and Feeble Files, +Monkey Island), Sierra's AGI adventures (such as early King's Quest and +Space Quest games), Adventure Soft's Simon the Sorcerer 1, 2 and Feeble Files, Revolution Software's Beneath a Steel Sky and Broken Sword 1 and 2, Interactive Binary Illusions' Flight of the Amazon Queen, -Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth and Westwood's -Legend of Kyrandia. +Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth, Westwood's +Legend of Kyrandia, and various others. #------------------------------------------------------------------------------ # install scripts @@ -49,8 +53,8 @@ mkdir tmp %build (cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) -(cd mpeg2dec-0.4.0; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) -./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} +(cd mpeg2dec-0.4.1; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release make %install @@ -59,6 +63,10 @@ install -m644 -D dists/scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6 install -m644 -D icons/scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm install -m644 -D gui/themes/modern.ini %{buildroot}%{_datadir}/scummvm/modern.ini install -m644 -D gui/themes/modern.zip %{buildroot}%{_datadir}/scummvm/modern.zip +install -m644 -D dists/pred.dic %{buildroot}%{_datadir}/scummvm/pred.dic +install -m644 -D %{_sourcedir}/kyra.dat %{buildroot}%{_datadir}/scummvm/kyra.dat +install -m644 -D %{_sourcedir}/queen.tbl %{buildroot}%{_datadir}/scummvm/queen.tbl +install -m644 -D %{_sourcedir}/sky.cpt %{buildroot}%{_datadir}/scummvm/sky.cpt desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop %clean @@ -69,11 +77,15 @@ rm -Rf ${RPM_BUILD_ROOT} #------------------------------------------------------------------------------ %files %defattr(0644,root,root,0755) -%doc AUTHORS README NEWS COPYING +%doc AUTHORS README NEWS COPYING COPYRIGHT %attr(0755,root,root)%{_bindir}/scummvm %{_datadir}/applications/* %{_datadir}/pixmaps/scummvm.xpm %{_datadir}/scummvm/modern.* +%{_datadir}/scummvm/pred.dic +%{_datadir}/scummvm/kyra.dat +%{_datadir}/scummvm/queen.tbl +%{_datadir}/scummvm/sky.cpt %{_mandir}/man6/scummvm.6* #------------------------------------------------------------------------------ diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in index 0745e699bc..77e4636baa 100644 --- a/dists/redhat/scummvm.spec.in +++ b/dists/redhat/scummvm.spec.in @@ -17,7 +17,10 @@ Url : http://www.scummvm.org Source : %{name}-%{version}.tar.bz2 Source1 : libmad-0.15.1b.tar.bz2 -Source2 : mpeg2dec-0.4.0b.tar.bz2 +Source2 : mpeg2dec-0.4.1.tar.bz2 +Source3 : kyra.dat +Source4 : queen.tbl +Source5 : sky.cpt BuildRoot : %{_tmppath}/%{name}-%{version}-root BuildRequires: desktop-file-utils @@ -34,11 +37,12 @@ BuildRequires: SDL-devel >= 1.2.2 %description ScummVM is an interpreter that will play graphic adventure games written for LucasArts' SCUMM virtual machine (such as Day of the Tentacle and -Monkey Island), Adventure Soft's Simon the Sorcerer 1, 2 and Feeble Files, +Monkey Island), Sierra's AGI adventures (such as early King's Quest and +Space Quest games), Adventure Soft's Simon the Sorcerer 1, 2 and Feeble Files, Revolution Software's Beneath a Steel Sky and Broken Sword 1 and 2, Interactive Binary Illusions' Flight of the Amazon Queen, -Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth and Westwood's -Legend of Kyrandia. +Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth, Westwood's +Legend of Kyrandia, and various others. #------------------------------------------------------------------------------ # install scripts @@ -49,8 +53,8 @@ mkdir tmp %build (cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) -(cd mpeg2dec-0.4.0; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) -./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} +(cd mpeg2dec-0.4.1; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release make %install @@ -59,6 +63,10 @@ install -m644 -D dists/scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6 install -m644 -D icons/scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm install -m644 -D gui/themes/modern.ini %{buildroot}%{_datadir}/scummvm/modern.ini install -m644 -D gui/themes/modern.zip %{buildroot}%{_datadir}/scummvm/modern.zip +install -m644 -D dists/pred.dic %{buildroot}%{_datadir}/scummvm/pred.dic +install -m644 -D %{_sourcedir}/kyra.dat %{buildroot}%{_datadir}/scummvm/kyra.dat +install -m644 -D %{_sourcedir}/queen.tbl %{buildroot}%{_datadir}/scummvm/queen.tbl +install -m644 -D %{_sourcedir}/sky.cpt %{buildroot}%{_datadir}/scummvm/sky.cpt desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop %clean @@ -69,11 +77,15 @@ rm -Rf ${RPM_BUILD_ROOT} #------------------------------------------------------------------------------ %files %defattr(0644,root,root,0755) -%doc AUTHORS README NEWS COPYING +%doc AUTHORS README NEWS COPYING COPYRIGHT %attr(0755,root,root)%{_bindir}/scummvm %{_datadir}/applications/* %{_datadir}/pixmaps/scummvm.xpm %{_datadir}/scummvm/modern.* +%{_datadir}/scummvm/pred.dic +%{_datadir}/scummvm/kyra.dat +%{_datadir}/scummvm/queen.tbl +%{_datadir}/scummvm/sky.cpt %{_mandir}/man6/scummvm.6* #------------------------------------------------------------------------------ diff --git a/dists/scummvm.rc b/dists/scummvm.rc index 5cf3aacac9..9bac6f6a2a 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -7,8 +7,8 @@ IDI_ICON ICON DISCARDABLE "../../icons/scummvm.ico" #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,10,0,0 - PRODUCTVERSION 0,10,0,0 + FILEVERSION 0,11,0,0 + PRODUCTVERSION 0,11,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -25,13 +25,13 @@ BEGIN BEGIN VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0" VALUE "FileDescription", "http://www.scummvm.org/\0" - VALUE "FileVersion", "0.10.0svn\0" + VALUE "FileVersion", "0.11.0svn\0" VALUE "InternalName", "scummvm\0" VALUE "LegalCopyright", "Copyright © 2001-2007 The ScummVM Team\0" VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0" VALUE "OriginalFilename", "scummvm.exe\0" VALUE "ProductName", "ScummVM\0" - VALUE "ProductVersion", "0.10.0svn\0" + VALUE "ProductVersion", "0.11.0svn\0" END END BLOCK "VarFileInfo" diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild index 579bb36e43..97171cbfd1 100755 --- a/dists/slackware/scummvm.SlackBuild +++ b/dists/slackware/scummvm.SlackBuild @@ -8,8 +8,7 @@ if [ "$TMP" = "" ]; then fi PKG=$TMP/package-scummvm -VERSION=0.7.1 -#VERSION=20031221 +VERSION=0.11.0svn ARCH=i486 BUILD=1 @@ -38,7 +37,7 @@ gzip -9 dists/scummvm.6 mkdir -p $PKG/usr/man/man6 cp dists/scummvm.6.gz $PKG/usr/man/man6 mkdir -p $PKG/usr/doc/scummvm-$VERSION -cp -a AUTHORS COPYING ChangeLog NEWS README TODO \ +cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README TODO \ $PKG/usr/doc/scummvm-$VERSION chmod 644 $PKG/usr/doc/scummvm-$VERSION mkdir -p $PKG/install |