diff --git a/stella/Announce.txt b/stella/Announce.txt index a4248f92e..146f83016 100644 --- a/stella/Announce.txt +++ b/stella/Announce.txt @@ -9,7 +9,7 @@ SSSS ttt eeeee llll llll aaaaa =============================================================================== - Release 2.6.1 for Linux, Mac OSX and Windows + Release 2.7 for Linux, Mac OSX and Windows =============================================================================== The Atari 2600 Video Computer System (VCS), introduced in 1977, was the most @@ -21,23 +21,25 @@ of your favorite 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. -This is the 2.6.1 release of Stella for Linux, Mac OSX, Windows and GP2X. +This is the 2.7 release of Stella for Linux, Mac OSX, Windows and GP2X. Distributions for other operating systems will appear as they become available. The distributions currently available are: - * Binary distribution in 32-bit RPM format for Linux (stella-2.6.1-1.i586.rpm) + * Binary distribution in 32-bit RPM format for Linux (stella-2.7-1.i586.rpm) - * Binary distribution in 32-bit Ubuntu DEB format (stella_2.6.1-1_i386.deb) + * Binary distribution in 32-bit Ubuntu DEB format (stella_2.7-1_i386.deb) - * Binary distribution in 64-bit Ubuntu DEB format (stella_2.6.1-1_amd64.deb) + * Binary distribution in 64-bit Ubuntu DEB format (stella_2.7-1_amd64.deb) - * Binary distribution for Mac OSX (StellaOSX2.6.1.dmg.gz) + * Binary distribution for Mac OSX (StellaOSX2.7.dmg.gz) - * Binary installer (exe) for Windows (stella-2.6.1-win32.exe) + * Binary installer (exe) for Windows (stella-2.7-win32.exe) - * Binary zip for Windows (stella-2.6.1-win32.zip) + * Binary zip for 64-bit Windows (stella-2.7-win64.zip) - * Source code distribution for all platforms (stella-2.6.1-src.tar.gz) + * Binary zip for Windows (stella-2.7-win32.zip) + + * Source code distribution for all platforms (stella-2.7-src.tar.gz) PLEASE DO NOT WRITE ASKING FOR ROM IMAGES TO USE WITH STELLA! ALL SUCH REQUESTS WILL BE IGNORED! diff --git a/stella/Copyright.txt b/stella/Copyright.txt index 7deafabff..e15a0f21d 100644 --- a/stella/Copyright.txt +++ b/stella/Copyright.txt @@ -12,7 +12,7 @@ License Information and Copyright Notice =============================================================================== -Copyright (C) 1995-2008 Bradford W. Mott and the Stella Team +Copyright (C) 1995-2009 Bradford W. Mott and the Stella Team This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/stella/Readme.txt b/stella/Readme.txt index b0bca3be2..8851e8622 100644 --- a/stella/Readme.txt +++ b/stella/Readme.txt @@ -1,4 +1,4 @@ -This is release 2.6.1 of Stella. Stella is a multi-platform Atari 2600 VCS +This is release 2.7 of Stella. Stella is a multi-platform Atari 2600 VCS emulator which allows you to play all of your favorite Atari 2600 games on your PC. You'll find the Stella Users Manual in the docs subdirectory. If you'd like to verify that you have the latest release of Stella visit @@ -9,4 +9,4 @@ the Stella Website at: Enjoy, The Stella Team -May 22, 2008 +January 17, 2009 diff --git a/stella/Todo.txt b/stella/Todo.txt index c8a5d50b4..4def97e2e 100644 --- a/stella/Todo.txt +++ b/stella/Todo.txt @@ -16,37 +16,6 @@ If you would like to contribute to Stella's development then find something on the list below and send email to Bradford Mott at bwmott@acm.org or Stephen Anthony at stephena@users.sourceforge.net. -X * New UI subsystem where drawing is done into separate buffers, not - directly into the TIA window - -X * Make UI 'font-sensitive' and remove all hardcoded dimensions for - widget/font sizes - -X * Add option to automatically save snapshots in 1X mode (useful for - RomInfoWidget) - -X * A way to override (possibly temporarily) all properties for a ROM, and - use global ones instead. Tied to the current developer commandline - options, but presented in a GUI (started from ROM launcher). - -X * Add infrastructure to show all info gathered from a ROM (similar to what - is currently displayed on the commandline). Add a UI part for this, so - users aren't forced to use the commandline to see it. - -X * Fix issue with paddle support in Activision Casino ROM. - - * More work to the ROM launcher, including at least the following: -X (1) Only show files with certain extensions (including a UI part to - edit this). - - (2) Shortcut key where selecting the first few letters jumps to a - directory named that way. Basically the same as is currently - done for ROMs. - -X (3) Have time between keypresses be configurable when jumping to files. - -X (4) Reload current listing (possibly tied to a RMB context menu). - * Add new TIA infrastructure with improved HMOVE emulation * 'Fixed Debug Colours' option as explained in the 'Stella 2.6.1 released' @@ -62,6 +31,11 @@ X (4) Reload current listing (possibly tied to a RMB context menu). bigger than 4K. Shouldn't make a difference for all 'well-designed' ROMS, but will pick up on errors when a ROM doesn't start from every bank. + * More work to the ROM launcher, including at least the following: + (1) Shortcut key where selecting the first few letters jumps to a + directory named that way. Basically the same as is currently + done for ROMs. + * More support for copy and paste. * Fix PropSet to properly delete entries when 'Default' is pressed in diff --git a/stella/debian/changelog b/stella/debian/changelog index ea55d41d7..41c98d1d3 100644 --- a/stella/debian/changelog +++ b/stella/debian/changelog @@ -1,3 +1,10 @@ +stella (2.7-1) stable; urgency=low + + * Version 2.7 release + + -- Stephen Anthony Sat, 17 Jan 2009 18:38:25 +0200 + + stella (2.6.1-1) stable; urgency=low * Version 2.6.1 release diff --git a/stella/docs/index.html b/stella/docs/index.html index 8b830aed5..20d84dcf5 100644 --- a/stella/docs/index.html +++ b/stella/docs/index.html @@ -225,50 +225,101 @@

New in Release 2.7

    -
  • FIXME - add info
    • - +
  • Added '-ss1x' commandline argument and associated UI item, used to + generate snapshots in 1x mode, independent of the filtering/scaling + currently in use.
    • + +
  • Various path textboxes in the UI now recognize './' (or '.\') to mean + the current directory. In Linux/UNIX, '~/' is also recognized to + mean your home directory.
    • + +
  • Large speedup in loading directories with many files in the ROM launcher.
    • + +
  • Fixed reset issue in 3E, 4A50, AR, CV, E7, F4SC, F6SC, F8SC, FASC and MC + ROMs; the internal RAM wasn't being randomized after the initial reset.
    • + +
  • M6532/RIOT RAM is now randomized at every reset, not just when the + emulation starts.
    • + +
  • Fixed bug in _diff pseudo-registers in the debugger; they were actually + defined backwards.
    • + +
  • Added fix for 'Challenge/Surfers Delight' ROM; the startup bank was + incorrect. Combined with the new 'Override Properties' functionality, + you can now play both games directly from the UI (no need to use the + commandline).
    • + +
  • Fixed paddle issue with Activision Casino ROM; the last card in game 4 + can now be reached.
    • + +
  • Added new pseudo-registers to the debugger, useful for conditional + breakpoints (_fcount, _cclocks, _vsync, _vblank).
    • + +
  • Added 'timing' commandline argument functionality to the UI, so you no + longer need to use the commandline to set it.
    • + +
  • Size restrictions on the TIA image are now strictly enforced. The + maximum height of a 1x TIA image is now 256 lines.
    • + +
  • Added a new setting to the 'fullres' option named 'auto'. Using + 'auto' will let Stella decide the best videomode to use in fullscreen.
    • + +
  • Changed 'gl_fsmax' option to mean 'scale TIA image in fullscreen'. It + will have no effect on UI modes.
    • + +
  • Changed 'gl_aspect' option to range 80-100 (previously, it was 50-100).
    • + +
  • Removed 'ui_zoom' and 'tia_zoom' options, replacing them with + 'tia_filter' (which can be zoom1x, zoom2x, etc). There is no equivalent + for ui_zoom, since the UI can no longer be scaled.
    • + +
  • Added experimental 64-bit version for Vista64 (may also work on WinXP64). + This hasn't been extensively tested, and is probably quite a bit slower + than the 32-bit version.
    • + +
  • OSX port now requires at least 10.3 and XCode 3.0 to compile. Sorry, + but I no longer have access to older systems to compile for 10.2.
    • + +
  • Huge updates to the documentation, particularly concerning the debugger. + Many features that have been in Stella for a while are now documented for + the first time.

diff --git a/stella/src/debugger/gui/RomListWidget.cxx b/stella/src/debugger/gui/RomListWidget.cxx index 5dff3a5b3..91699c024 100644 --- a/stella/src/debugger/gui/RomListWidget.cxx +++ b/stella/src/debugger/gui/RomListWidget.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: RomListWidget.cxx,v 1.17 2009-01-01 18:13:35 stephena Exp $ +// $Id: RomListWidget.cxx,v 1.18 2009-01-15 18:45:23 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -186,3 +186,18 @@ GUI::Rect RomListWidget::getEditRect() const return r; } + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +bool RomListWidget::tryInsertChar(char c, int pos) +{ + // Not sure how efficient this is, or should we even care? + c = tolower(c); + if((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || + c == '%' || c == '#' || c == '$' || c == ' ') + { + _editString.insert(pos, 1, c); + return true; + } + else + return false; +} diff --git a/stella/src/debugger/gui/RomListWidget.hxx b/stella/src/debugger/gui/RomListWidget.hxx index b85e34a7d..c51f91e74 100644 --- a/stella/src/debugger/gui/RomListWidget.hxx +++ b/stella/src/debugger/gui/RomListWidget.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: RomListWidget.hxx,v 1.9 2009-01-01 18:13:35 stephena Exp $ +// $Id: RomListWidget.hxx,v 1.10 2009-01-15 18:45:23 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -49,6 +49,8 @@ class RomListWidget : public CheckListWidget GUI::Rect getLineRect() const; GUI::Rect getEditRect() const; + bool tryInsertChar(char c, int pos); + private: ContextMenu* myMenu; int myHighlightedItem; diff --git a/stella/src/gui/AboutDialog.cxx b/stella/src/gui/AboutDialog.cxx index 69ca71bd9..93d9f40e7 100644 --- a/stella/src/gui/AboutDialog.cxx +++ b/stella/src/gui/AboutDialog.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: AboutDialog.cxx,v 1.30 2009-01-04 22:27:43 stephena Exp $ +// $Id: AboutDialog.cxx,v 1.31 2009-01-15 18:45:23 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -45,7 +45,7 @@ AboutDialog::AboutDialog(OSystem* osystem, DialogContainer* parent, WidgetArray wid; // Set real dimensions - _w = 52 * fontWidth + 10; + _w = 52 * fontWidth + 8; _h = 12 * lineHeight + 20; // Add Previous, Next and Close buttons diff --git a/stella/src/gui/CommandDialog.cxx b/stella/src/gui/CommandDialog.cxx index 8932c8141..9507399db 100644 --- a/stella/src/gui/CommandDialog.cxx +++ b/stella/src/gui/CommandDialog.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: CommandDialog.cxx,v 1.23 2009-01-01 18:13:38 stephena Exp $ +// $Id: CommandDialog.cxx,v 1.24 2009-01-15 18:45:23 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -42,66 +42,48 @@ CommandDialog::CommandDialog(OSystem* osystem, DialogContainer* parent) rowHeight = font.getLineHeight() + 10; // Set real dimensions - _w = 4 * (buttonWidth + 5) + 20; - _h = 4 * rowHeight + 15; + _w = 3 * (buttonWidth + 5) + 20; + _h = 6 * rowHeight + 15; - int xoffset = 10, yoffset = 10; WidgetArray wid; - ButtonWidget* b = NULL; + ButtonWidget* b[16]; - b = addCDButton("Select", kSelectCmd); - wid.push_back(b); - - b = addCDButton("Reset", kResetCmd); - wid.push_back(b); - - b = addCDButton("Color TV", kColorCmd); - wid.push_back(b); - - b = addCDButton("B/W TV", kBWCmd); - wid.push_back(b); + // Row 1 + int xoffset = 10, yoffset = 10; + b[0] = addCDButton("Select", kSelectCmd); + b[4] = addCDButton("Left Diff A", kLeftDiffACmd); + b[8] = addCDButton("Save State", kSaveStateCmd); + // Row 2 xoffset = 10; yoffset += buttonHeight + 3; + b[1] = addCDButton("Reset", kResetCmd); + b[5] = addCDButton("Left Diff B", kLeftDiffBCmd); + b[9] = addCDButton("State Slot", kStateSlotCmd); - b = addCDButton("Left Diff A", kLeftDiffACmd); - wid.push_back(b); - - b = addCDButton("Left Diff B", kLeftDiffBCmd); - wid.push_back(b); - - b = addCDButton("Right Diff A", kRightDiffACmd); - wid.push_back(b); - - b = addCDButton("Right Diff B", kRightDiffBCmd); - wid.push_back(b); - + // Row 3 xoffset = 10; yoffset += buttonHeight + 3; + b[2] = addCDButton("Color TV", kColorCmd); + b[6] = addCDButton("Right Diff A", kRightDiffACmd); + b[10] = addCDButton("Load State", kLoadStateCmd); - b = addCDButton("Save State", kSaveStateCmd); - wid.push_back(b); - - b = addCDButton("State Slot", kStateSlotCmd); - wid.push_back(b); - - b = addCDButton("Load State", kLoadStateCmd); - wid.push_back(b); - - b = addCDButton("Snapshot", kSnapshotCmd); - wid.push_back(b); - + // Row 4 xoffset = 10; yoffset += buttonHeight + 3; + b[3] = addCDButton("B/W TV", kBWCmd); + b[7] = addCDButton("Right Diff B", kRightDiffBCmd); + b[11] = addCDButton("Snapshot", kSnapshotCmd); - b = addCDButton("NTSC/PAL", kFormatCmd); - wid.push_back(b); + // Row 5 + xoffset = 10; yoffset += buttonHeight + 3; + b[12] = addCDButton("NTSC/PAL", kFormatCmd); + b[13] = addCDButton("Palette", kPaletteCmd); + b[14] = addCDButton("Reload ROM", kReloadRomCmd); - b = addCDButton("Palette", kPaletteCmd); - wid.push_back(b); + // Row 6 + xoffset = 10 + buttonWidth + 6; yoffset += buttonHeight + 3; + b[15] = addCDButton("Exit Game", kExitCmd); - b = addCDButton("Reload ROM", kReloadRomCmd); - wid.push_back(b); - - b = addCDButton("Exit Game", kExitCmd); - wid.push_back(b); + for(uInt8 i = 0; i < 16; ++i) + wid.push_back(b[i]); addToFocusList(wid); } @@ -115,6 +97,7 @@ CommandDialog::~CommandDialog() void CommandDialog::handleCommand(CommandSender* sender, int cmd, int data, int id) { + // TODO - fix the logic here; it doesn't seem it needs to be this complex bool consoleCmd = false, stateCmd = false; Event::Type event = Event::NoType; @@ -162,7 +145,7 @@ void CommandDialog::handleCommand(CommandSender* sender, int cmd, case kSaveStateCmd: event = Event::SaveState; - stateCmd = true; + consoleCmd = true; break; case kStateSlotCmd: @@ -172,7 +155,7 @@ void CommandDialog::handleCommand(CommandSender* sender, int cmd, case kLoadStateCmd: event = Event::LoadState; - stateCmd = true; + consoleCmd = true; break; case kSnapshotCmd: diff --git a/stella/src/gui/FileSnapDialog.cxx b/stella/src/gui/FileSnapDialog.cxx index 7e7563852..54cf6ce13 100644 --- a/stella/src/gui/FileSnapDialog.cxx +++ b/stella/src/gui/FileSnapDialog.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: FileSnapDialog.cxx,v 1.26 2009-01-11 19:10:40 stephena Exp $ +// $Id: FileSnapDialog.cxx,v 1.27 2009-01-15 18:45:23 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -48,7 +48,7 @@ FileSnapDialog::FileSnapDialog( ButtonWidget* b; // Set real dimensions - _w = 52 * fontWidth + 10; + _w = 52 * fontWidth + 8; _h = 10 * (lineHeight + 4) + 10; xpos = vBorder; ypos = vBorder; diff --git a/stella/src/gui/GameInfoDialog.cxx b/stella/src/gui/GameInfoDialog.cxx index e2547a8f1..7938a8d79 100644 --- a/stella/src/gui/GameInfoDialog.cxx +++ b/stella/src/gui/GameInfoDialog.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: GameInfoDialog.cxx,v 1.64 2009-01-13 20:26:02 stephena Exp $ +// $Id: GameInfoDialog.cxx,v 1.65 2009-01-15 18:45:23 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -53,7 +53,7 @@ GameInfoDialog::GameInfoDialog( StringMap items, ports, ctrls; // Set real dimensions - _w = 54 * fontWidth + 10; + _w = 52 * fontWidth + 8; _h = 12 * (lineHeight + 4) + 10; //////////////////////////////////////////////////////////////////// @@ -131,10 +131,10 @@ GameInfoDialog::GameInfoDialog( ypos += lineHeight + 3; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, "Type:", kTextAlignLeft); - pwidth = font.getStringWidth("SB (128-256k SUPERbanking)"); + pwidth = font.getStringWidth("MC (C. Wilkson Megacart)"); items.clear(); items.push_back("Auto-detect", "AUTO-DETECT"); - items.push_back("0840 (8K ECONObanking)", "0840" ); + items.push_back("0840 (8K ECONObank)", "0840" ); items.push_back("2K (2K Atari)", "2K" ); items.push_back("3E (32K Tigervision)", "3E" ); items.push_back("3F (512K Tigervision)", "3F" ); @@ -155,7 +155,7 @@ GameInfoDialog::GameInfoDialog( items.push_back("FE (8K Decathlon)", "FE" ); items.push_back("MB (Dynacom Megaboy)", "MB" ); items.push_back("MC (C. Wilkson Megacart)", "MC" ); - items.push_back("SB (128-256k SUPERbanking)", "SB" ); + items.push_back("SB (128-256k SUPERbank)", "SB" ); items.push_back("UA (8K UA Ltd.)", "UA" ); items.push_back("X07 (64K AtariAge)", "X07" ); myType = new PopUpWidget(myTab, font, xpos+lwidth, ypos, @@ -232,6 +232,7 @@ GameInfoDialog::GameInfoDialog( new StaticTextWidget(myTab, font, xpos, ypos+1, font.getStringWidth("in "), fontHeight, "in ", kTextAlignLeft); xpos += font.getStringWidth("in "); + pwidth = font.getStringWidth("right port"); ports.clear(); ports.push_back("left port", "L"); ports.push_back("right port", "R"); @@ -240,6 +241,7 @@ GameInfoDialog::GameInfoDialog( wid.push_back(myLeftPort); xpos = 10; ypos += lineHeight + 5; + pwidth = font.getStringWidth("CX-22 Trakball"); new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, "P1 Controller:", kTextAlignLeft); myP1Controller = new PopUpWidget(myTab, font, xpos+lwidth, ypos, @@ -247,6 +249,7 @@ GameInfoDialog::GameInfoDialog( wid.push_back(myP1Controller); xpos += lwidth+myP1Controller->getWidth() + 4; + pwidth = font.getStringWidth("right port"); new StaticTextWidget(myTab, font, xpos, ypos+1, font.getStringWidth("in "), fontHeight, "in ", kTextAlignLeft); xpos += font.getStringWidth("in "); diff --git a/stella/src/gui/GlobalPropsDialog.cxx b/stella/src/gui/GlobalPropsDialog.cxx index 9630680bd..9dae9cf97 100644 --- a/stella/src/gui/GlobalPropsDialog.cxx +++ b/stella/src/gui/GlobalPropsDialog.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: GlobalPropsDialog.cxx,v 1.3 2009-01-05 19:44:29 stephena Exp $ +// $Id: GlobalPropsDialog.cxx,v 1.4 2009-01-15 18:45:23 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -43,7 +43,7 @@ GlobalPropsDialog:: buttonHeight = font.getLineHeight() + 4; int xpos, ypos; int lwidth = font.getStringWidth("Right Difficulty: "), - pwidth = font.getStringWidth("SB (128-256k SUPERbanking)"); + pwidth = font.getStringWidth("MC (C. Wilkson Megacart)"); WidgetArray wid; StringMap items; @@ -65,7 +65,7 @@ GlobalPropsDialog:: items.clear(); items.push_back("Default", "DEFAULT"); items.push_back("Auto-detect", "AUTO-DETECT"); - items.push_back("0840 (8K ECONObanking)", "0840" ); + items.push_back("0840 (8K ECONObank)", "0840" ); items.push_back("2K (2K Atari)", "2K" ); items.push_back("3E (32K Tigervision)", "3E" ); items.push_back("3F (512K Tigervision)", "3F" ); @@ -86,7 +86,7 @@ GlobalPropsDialog:: items.push_back("FE (8K Decathlon)", "FE" ); items.push_back("MB (Dynacom Megaboy)", "MB" ); items.push_back("MC (C. Wilkson Megacart)", "MC" ); - items.push_back("SB (128-256k SUPERbanking)", "SB" ); + items.push_back("SB (128-256k SUPERbank)", "SB" ); items.push_back("UA (8K UA Ltd.)", "UA" ); items.push_back("X07 (64K AtariAge)", "X07" ); myBSType = new PopUpWidget(this, font, xpos+lwidth, ypos, diff --git a/stella/src/unix/stella.SlackBuild b/stella/src/unix/stella.SlackBuild index 2689568fc..f9967aa86 100644 --- a/stella/src/unix/stella.SlackBuild +++ b/stella/src/unix/stella.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: stella.SlackBuild,v 1.12 2008-05-20 14:35:50 stephena Exp $ +# $Id: stella.SlackBuild,v 1.13 2009-01-15 18:45:23 stephena Exp $ # stella.SlackBuild for Stella 2.x, B. Watson, 2005 @@ -13,7 +13,7 @@ die() { exit 1 } -VERSION=2.6.1 +VERSION=2.7 ARCH=${ARCH-i486} BUILD=1 diff --git a/stella/src/unix/stella.spec b/stella/src/unix/stella.spec index f7a5c2eb3..3a889aad2 100644 --- a/stella/src/unix/stella.spec +++ b/stella/src/unix/stella.spec @@ -1,5 +1,5 @@ %define name stella -%define version 2.6.1 +%define version 2.7 %define rel 1 %define enable_gl 1 @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %_datadir/icons/large/%{name}.png %changelog +* Sat Jan 17 2009 Stephen Anthony 2.7-1 +- Version 2.7 release + * Thu May 22 2008 Stephen Anthony 2.6.1-1 - Version 2.6.1 release diff --git a/stella/src/win32/stella.iss b/stella/src/win32/stella.iss index 0d1a21a91..244116fca 100755 --- a/stella/src/win32/stella.iss +++ b/stella/src/win32/stella.iss @@ -3,14 +3,14 @@ [Setup] AppName=Stella -AppVerName=Stella 2.6.1 +AppVerName=Stella 2.7 AppPublisher=Bradford W. Mott and the Stella team AppPublisherURL=http://stella.sourceforge.net AppSupportURL=http://stella.sourceforge.net AppUpdatesURL=http://stella.sourceforge.net DefaultDirName={pf}\Stella DefaultGroupName=Stella -OutputBaseFilename=stella-2.6.1-win32 +OutputBaseFilename=stella-2.7-win32 Compression=lzma SolidCompression=yes @@ -21,10 +21,10 @@ Name: "eng"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "..\..\stella-2.6.1\Stella.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\stella-2.6.1\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\stella-2.6.1\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\stella-2.6.1\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\..\stella-2.7\Stella.exe"; DestDir: "{app}"; Flags: ignoreversion +;Source: "..\..\stella-2.7\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\stella-2.7\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\stella-2.7\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/stella/src/win32/stella.rc b/stella/src/win32/stella.rc index 31b0b2ffb..fbc054292 100755 --- a/stella/src/win32/stella.rc +++ b/stella/src/win32/stella.rc @@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,6,1,0 - PRODUCTVERSION 2,6,1,0 + FILEVERSION 2,7,0,0 + PRODUCTVERSION 2,7,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 GPL." VALUE "CompanyName", "Bradford W. Mott and the Stella team (http://stella.sourceforge.net)" VALUE "FileDescription", "Stella" - VALUE "FileVersion", "2.6.1" + VALUE "FileVersion", "2.7" VALUE "InternalName", "Stella" VALUE "LegalCopyright", "Copyright (C) 1995-2009 B. Mott & the Stella team" VALUE "OriginalFilename", "Stella.exe" VALUE "ProductName", "Stella" - VALUE "ProductVersion", "2.6.1" + VALUE "ProductVersion", "2.7" END END BLOCK "VarFileInfo"