diff --git a/stella/Makefile b/stella/Makefile index 3eabea009..9b3bf3869 100644 --- a/stella/Makefile +++ b/stella/Makefile @@ -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: Makefile,v 1.29 2006-11-09 03:06:42 stephena Exp $ +## $Id: Makefile,v 1.30 2006-12-20 20:36:25 stephena Exp $ ## ## Based on code from ScummVM - Scumm Interpreter ## Copyright (C) 2002-2004 The ScummVM project @@ -206,7 +206,7 @@ win32dist: stella$(EXEEXT) cp Announce.txt Changes.txt Copyright.txt License.txt README-SDL.txt Readme.txt Todo.txt $(DISTNAME)/docs cp -r docs/*.html $(DISTNAME)/docs cp -r docs/graphics/*.png $(DISTNAME)/docs/graphics - cp /mingw/bin/SDL.dll $(DISTNAME) + cp /mingw/bin/SDL.dll /mingw/bin/zlib1.dll $(DISTNAME) # u2d $(DISTNAME)/*.txt # zip $(DISTNAME)-win32.zip $(DISTNAME) diff --git a/stella/src/win32/stella.iss b/stella/src/win32/stella.iss index 46fc5cef5..60a47f018 100755 --- a/stella/src/win32/stella.iss +++ b/stella/src/win32/stella.iss @@ -22,9 +22,9 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ [Files] Source: "H:\windows\src\stella\stella.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "H:\windows\src\stella\stella-2.2\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "H:\windows\src\stella\stella-2.2\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "H:\windows\src\stella\stella-2.2\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "H:\windows\src\stella\stella-2.3\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "H:\windows\src\stella\stella-2.3\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "H:\windows\src\stella\stella-2.3\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 587ddd697..0e6726910 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,2,0,0 - PRODUCTVERSION 2,2,0,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,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.2" + VALUE "FileVersion", "2.3" VALUE "InternalName", "Stella" VALUE "LegalCopyright", "Copyright (C) 1995-2006 B. Mott & the Stella team" VALUE "OriginalFilename", "Stella.exe" VALUE "ProductName", "Stella" - VALUE "ProductVersion", "2.2" + VALUE "ProductVersion", "2.3" END END BLOCK "VarFileInfo"