Fixed some warnings, and updates for 5.1 release.

This commit is contained in:
Stephen Anthony 2018-02-03 19:29:27 -03:30
parent 6c5bddcdf8
commit 26096fcc47
10 changed files with 36 additions and 24 deletions

View File

@ -9,7 +9,7 @@
SSSS ttt eeeee llll llll aaaaa
===========================================================================
Release 5.0.2 for Linux, MacOSX and Windows
Release 5.1 for Linux, MacOSX and Windows
===========================================================================
The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@ -21,30 +21,30 @@ 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 5.0.2 release of Stella for Linux, Mac OSX and Windows. The
This is the 5.1 release of Stella for Linux, Mac OSX and Windows. The
distributions currently available are:
* Binaries for Windows XP_SP3(*)/Vista/7/8/10 :
Stella-5.0.2-win32.exe (32-bit EXE installer)
Stella-5.0.2-x64.exe (64-bit EXE installer)
Stella-5.0.2-windows.zip (32/64 bit versions)
Stella-5.1-win32.exe (32-bit EXE installer)
Stella-5.1-x64.exe (64-bit EXE installer)
Stella-5.1-windows.zip (32/64 bit versions)
(*) Note: Support for Windows XP is problematic on some systems,
and will probably be discontinued in a future release.
* Binary distribution for MacOS X 10.7 and above :
Stella-5.0.2-macosx.dmg (64-bit Intel)
Stella-5.1-macosx.dmg (64-bit Intel)
* Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
stella_5.0.2-1_i386.deb
stella_5.0.2-1_amd64.deb
stella_5.1-1_i386.deb
stella_5.1-1_amd64.deb
* Binary distribution in 32-bit & 64-bit RPM format :
stella-5.0.2-2.i386.rpm
stella-5.0.2-2.x86_64.rpm
stella-5.1-2.i386.rpm
stella-5.1-2.x86_64.rpm
* Source code distribution for all platforms :
stella-5.0.2-src.tar.xz
stella-5.1-src.tar.xz
Distribution Site

View File

@ -1,4 +1,4 @@
5.0.2 to 5.1: (January xx, 2018)
5.0.2 to 5.1: (February 4, 2018)
* Thumbulator support is not conditional any more.

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
stella (5.1-1) stable; urgency=high
* Version 5.1 release
-- Stephen Anthony <stephena@users.sf.net> Sun, 4 Feb 2018 17:09:59 -0230
stella (5.0.2-1) stable; urgency=high
* Version 5.0.2 release

View File

@ -390,7 +390,8 @@ void FrameBuffer::drawFrameStats()
string bsinfo = info.BankSwitch +
(myOSystem.settings().getBool("dev.settings") ? "| Developer" : "");
// draw shadowed text
color = myOSystem.console().tia().scanlinesLastFrame() != myLastScanlines ? kDbgColorRed : myStatsMsg.color;
color = myOSystem.console().tia().scanlinesLastFrame() != myLastScanlines ?
uInt32(kDbgColorRed) : myStatsMsg.color;
std::snprintf(msg, 30, "%3u", myOSystem.console().tia().scanlinesLastFrame());
myStatsMsg.surface->drawString(font(), msg, xPos, YPOS,
myStatsMsg.w, color, TextAlign::Left, 0, true, kBGColor);

View File

@ -222,7 +222,8 @@ void RadioButtonWidget::drawWidget(bool hilite)
s.drawBitmap(radio_img_outercircle, _x, _y + _boxY, kShadowColor, 14, 14);
// Draw the inner bounding circle with enabled color
s.drawBitmap(radio_img_innercircle, _x + 2, _y + _boxY + 2, isEnabled() ? _bgcolor : kColor, 10, 10);
s.drawBitmap(radio_img_innercircle, _x + 2, _y + _boxY + 2,
isEnabled() ? _bgcolor : uInt32(kColor), 10, 10);
// draw state
if(_state)

View File

@ -656,8 +656,8 @@ void CheckboxWidget::drawWidget(bool hilite)
if(_drawBox)
s.box(_x, _y + _boxY, 14, 14, kColor, kShadowColor);
// Do we draw a square or cross?
s.fillRect(_x + 2, _y + _boxY + 2, 10, 10, _changed ? kDbgChangedColor
: isEnabled() ? _bgcolor : kColor);
s.fillRect(_x + 2, _y + _boxY + 2, 10, 10, _changed ? uInt32(kDbgChangedColor)
: isEnabled() ? _bgcolor : uInt32(kColor));
if(_state)
s.drawBitmap(_img, _x + 3, _y + _boxY + 3, isEnabled() ? kCheckColor : kShadowColor);
#else

View File

@ -1,8 +1,8 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Stella";
CFBundleShortVersionString = "Stella version 5.0.2";
CFBundleGetInfoString = "Stella version 5.0.2";
CFBundleShortVersionString = "Stella version 5.1";
CFBundleGetInfoString = "Stella version 5.1";
NSHumanReadableCopyright = "Stella MacOS X version by Stephen Anthony and Mark Grebe.";
"Atari 2600 Cartridge File" = "Atari 2600 Cartridge File";

View File

@ -53,7 +53,7 @@
<key>CFBundleSignature</key>
<string>StLa</string>
<key>CFBundleVersion</key>
<string>5.0.2</string>
<string>5.1</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.games</string>
<key>LSMinimumSystemVersionByArchitecture</key>

View File

@ -1,5 +1,5 @@
%define name stella
%define version 5.0.2
%define version 5.1
%define rel 1
%define enable_sound 1
@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%_datadir/icons/large/%{name}.png
%changelog
* Sun Feb 04 2018 Stephen Anthony <stephena@users.sf.net> 5.1-1
- Version 5.1 release
* Sun Aug 20 2017 Stephen Anthony <stephena@users.sf.net> 5.0.2-1
- Version 5.0.2 release

View File

@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 5,0,2,0
PRODUCTVERSION 5,0,2,0
FILEVERSION 5,1,0,0
PRODUCTVERSION 5,1,0,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 (https://stella-emu.github.io)"
VALUE "FileDescription", "Stella"
VALUE "FileVersion", "5.0.2"
VALUE "FileVersion", "5.1"
VALUE "InternalName", "Stella"
VALUE "LegalCopyright", "Copyright (C) 1995-2018 The Stella Team"
VALUE "OriginalFilename", "Stella.exe"
VALUE "ProductName", "Stella"
VALUE "ProductVersion", "5.0.2"
VALUE "ProductVersion", "5.1"
END
END
BLOCK "VarFileInfo"