Added icon file for the Win32 build. This means that an icon will be

compiled into Stella, and Stella will be shown with an icon in Windows
Explorer, etc.

Modified Makefile to create a Win32 binary package from the commandline.
You can do 'make win32dist DISTNAME=stella-release', and a package
named 'stella-release' will be created.  Still todo is get zip support
working, so it can be zipped directly from the Makefile.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@854 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

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.10 2005-10-03 00:53:20 stephena Exp $
+## $Id: Makefile,v 1.11 2005-10-22 20:33:57 stephena Exp $
 ##
 ##   Based on code from ScummVM - Scumm Interpreter
 ##   Copyright (C) 2002-2004 The ScummVM project
@@ -34,6 +34,8 @@ OBJS	    :=
 MODULES     :=
 MODULE_DIRS :=
 
+DISTNAME    := stella-snapshot
+
 # Load the make rules generated by configure
 include config.mak
 
@@ -142,7 +144,6 @@ endif
 
 ifdef HAVE_NASM
 .SUFFIXES: .asm
-
 .asm.o:
 	$(NASM) -O1 $(NASMFLAGS) -g -o $*.o $(<)
 endif
@@ -178,14 +179,23 @@ uninstall:
 	rm -f  "$(DESTDIR)$(DATADIR)/icons/stella.xpm"
 	rm -f  "$(DESTDIR)/etc/stella.pro"
 
-# Special target to create a snapshot binary
+# Special rule for Win32 icon stuff (there's probably a better way to do this ...)
-dist: stella$(EXEEXT)
+src/win32/stella_icon.o: src/win32/stella.ico src/win32/stella.rc
-	rm -rf stella-snapshot
+	windres --include-dir src/win32 src/win32/stella.rc src/win32/stella_icon.o 
-	mkdir -p stella-snapshot/docs
+		
-	strip stella$(EXEEXT) -o stella-snapshot/stella$(EXEEXT)
+# Special target to create a Win32 snapshot package
-	cp src/emucore/stella.pro stella-snapshot
+win32dist: stella$(EXEEXT)
-	cp Announce.txt Changes.txt Copyright.txt License.txt README-PSP.txt README-SDL.txt Readme.txt Todo.txt stella-snapshot/docs
+	rm -rf $(DISTNAME)
-	cp -r docs/graphics stella-snapshot/docs
+	mkdir -p $(DISTNAME)/docs/graphics
+	strip stella$(EXEEXT) -o $(DISTNAME)/stella$(EXEEXT)
+	cp src/emucore/stella.pro $(DISTNAME)
+	cp Announce.txt Changes.txt Copyright.txt License.txt README-PSP.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 src/win32/stella.ico $(DISTNAME)
+	cp /usr/bin/SDL.dll /mingw/bin/libpng12.dll /mingw/bin/zlib1.dll $(DISTNAME)
+#	u2d $(DISTNAME)/*.txt
+#	zip $(DISTNAME)-win32.zip $(DISTNAME)
 
 # Special target to create psp stuff
 psp-package: $(EXECUTABLE)
@@ -223,4 +233,4 @@ psp-layout:
 	umount $(PSP-MOUNTPOINT)
 
 
-.PHONY: deb bundle test win32dist dist install uninstall
+.PHONY: deb bundle test win32dist install uninstall

stella/configure

@@ -714,6 +714,7 @@ case $_host_os in
 			DEFINES="$DEFINES -DBSPF_WIN32 -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES"
 			MODULES="$MODULES $SRC/win32"
 			INCLUDES="$INCLUDES -I$SRC/win32"
+			LIBS="$LIBS -lmingw32 -lwinmm"
 
 			# Add OpenGL stuff
 			if test "$_build_gl" = yes ; then

stella/src/gui/LauncherDialog.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: LauncherDialog.cxx,v 1.32 2005-10-19 00:59:51 stephena Exp $
+// $Id: LauncherDialog.cxx,v 1.33 2005-10-22 20:33:57 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -158,6 +158,7 @@ void LauncherDialog::updateListing(bool fullReload)
   if(romdir == "")
   {
     myOptionsButton->setEnabled(true);
+    myQuitButton->setEnabled(true);
     parent()->addDialog(myOptions);
     return;
   }

stella/src/win32/Stella.vcproj

@@ -1076,6 +1076,12 @@ opengl32.lib"
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			<File
+				RelativePath=".\stella.ico">
+			</File>
+			<File
+				RelativePath=".\stella.rc">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

stella/src/win32/module.mk

@@ -3,7 +3,8 @@ MODULE := src/win32
 MODULE_OBJS := \
 	src/win32/FSNodeWin32.o \
 	src/win32/OSystemWin32.o \
-	src/win32/SettingsWin32.o
+	src/win32/SettingsWin32.o \
+	src/win32/stella_icon.o
 
 MODULE_DIRS += \
 	src/win32

stella/src/win32/stella.rc

@@ -0,0 +1,112 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winresrc.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON                ICON                    "stella.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 2,0,1,0
+ PRODUCTVERSION 2,0,1,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        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.0.1"
+            VALUE "InternalName", "Stella"
+            VALUE "LegalCopyright", "Copyright (C) 1995-2005 B. Mott & the Stella team"
+            VALUE "OriginalFilename", "Stella.exe"
+            VALUE "ProductName", "Stella"
+            VALUE "ProductVersion", "2.0.1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winresrc.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+