Updates for 4.1.1 release.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2995 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-09-14 19:58:37 +00:00
parent 3108b7a696
commit 9ac1244706
8 changed files with 53 additions and 21 deletions

View File

@ -9,7 +9,7 @@
SSSS ttt eeeee llll llll aaaaa
===========================================================================
Release 4.1 for Linux, MacOSX and Windows
Release 4.1.1 for Linux, MacOSX and Windows
===========================================================================
The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@ -21,27 +21,27 @@ all of your favourite Atari 2600 games again! Stella was originally
developed for Linux by Bradford W. Mott, however, it has been ported to a
number of other platforms and is currently maintained by Stephen Anthony.
This is the 4.1 release of Stella for Linux, Mac OSX and Windows. The
This is the 4.1.1 release of Stella for Linux, Mac OSX and Windows. The
distributions currently available are:
* Binaries for Windows XP_SP3/Vista/7/8 :
Stella-4.1-win32.exe (32-bit EXE installer)
Stella-4.1-x64.exe (64-bit EXE installer)
Stella-4.1-windows.zip (32/64 bit versions)
Stella-4.1.1-win32.exe (32-bit EXE installer)
Stella-4.1.1-x64.exe (64-bit EXE installer)
Stella-4.1.1-windows.zip (32/64 bit versions)
* Binary distribution for MacOS X 10.5 and above :
Stella-4.1-macosx.dmg (32/64-bit Intel Universal Binary)
Stella-4.1.1-macosx.dmg (32/64-bit Intel Universal Binary)
* Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
stella_4.1-1_i386.deb
stella_4.1-1_amd64.deb
stella_4.1.1-1_i386.deb
stella_4.1.1-1_amd64.deb
* Binary distribution in 32-bit & 64-bit RPM format :
stella-4.1-2.i386.rpm
stella-4.1-2.x86_64.rpm
stella-4.1.1-2.i386.rpm
stella-4.1.1-2.x86_64.rpm
* Source code distribution for all platforms :
stella-4.1-src.tar.gz
stella-4.1.1-src.tar.gz
Distribution Site

View File

@ -12,7 +12,7 @@
Release History
===========================================================================
4.1 to 4.2: (September x, 2014)
4.1 to 4.1.1: (September 14, 2014)
* Re-added 'uipalette' option due to popular demand (of at least one
person :)).

View File

@ -10,7 +10,7 @@
<br><br>
<center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
<center><h4><b>Release 4.1</b></h4></center>
<center><h4><b>Release 4.1.1</b></h4></center>
<br><br>
<center><h2><b>User's Guide</b></h2></center>

View File

@ -22,7 +22,7 @@
#include <cstdlib>
#define STELLA_VERSION "4.2_pre"
#define STELLA_VERSION "4.1.1"
#define STELLA_BUILD atoi("$Rev$" + 6)
#endif

View File

@ -53,7 +53,7 @@
<key>CFBundleSignature</key>
<string>StLa</string>
<key>CFBundleVersion</key>
<string>4.1</string>
<string>4.1.1</string>
<key>LSMinimumSystemVersionByArchitecture</key>
<dict>
<key>i386</key>

View File

@ -1,5 +1,5 @@
%define name stella
%define version 4.1
%define version 4.1.1
%define rel 1
%define enable_gl 1
@ -102,7 +102,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%_datadir/icons/large/%{name}.png
%changelog
* Min Sep 1 2014 Stephen Anthony <stephena@users.sf.net> 4.1-1
* Sun Sep 14 2014 Stephen Anthony <stephena@users.sf.net> 4.1.1-1
- Version 4.1.1 release
* Mon Sep 1 2014 Stephen Anthony <stephena@users.sf.net> 4.1-1
- Version 4.1 release
* Tue Jul 1 2014 Stephen Anthony <stephena@users.sf.net> 4.0-1

View File

@ -0,0 +1,29 @@
--- SDL_windowsevents.c.orig 2014-03-16 00:01:43.000000000 -0230
+++ SDL_windowsevents.c 2014-09-07 17:51:51.983290900 -0230
@@ -765,19 +765,23 @@
}
return (1);
-#if defined(SC_SCREENSAVE) || defined(SC_MONITORPOWER)
case WM_SYSCOMMAND:
{
+ /* Disable beep on Alt-key press */
+ if ((wParam & 0xFFF0) == SC_KEYMENU) {
+ return (0);
+ }
+#if defined(SC_SCREENSAVE) || defined(SC_MONITORPOWER)
/* Don't start the screensaver or blank the monitor in fullscreen apps */
- if ((wParam & 0xFFF0) == SC_SCREENSAVE ||
+ else if ((wParam & 0xFFF0) == SC_SCREENSAVE ||
(wParam & 0xFFF0) == SC_MONITORPOWER) {
if (SDL_GetVideoDevice()->suspend_screensaver) {
return (0);
}
}
+#endif /* System has screensaver support */
}
break;
-#endif /* System has screensaver support */
case WM_CLOSE:
{

View File

@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,1,0,0
PRODUCTVERSION 4,1,0,0
FILEVERSION 4,1,1,0
PRODUCTVERSION 4,1,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -55,12 +55,12 @@ BEGIN
VALUE "Comments", "The multi-platform Atari 2600 emulator. Stella is released under the GPLv2."
VALUE "CompanyName", "The Stella Team (http://stella.sourceforge.net)"
VALUE "FileDescription", "Stella"
VALUE "FileVersion", "4.1"
VALUE "FileVersion", "4.1.1"
VALUE "InternalName", "Stella"
VALUE "LegalCopyright", "Copyright (C) 1995-2014 The Stella Team"
VALUE "OriginalFilename", "Stella.exe"
VALUE "ProductName", "Stella"
VALUE "ProductVersion", "4.1"
VALUE "ProductVersion", "4.1.1"
END
END
BLOCK "VarFileInfo"