Windows icon now appears everywhere it is supposed to.

pete-gordon · Feb 17, 2010 · 530391c · 530391c
1 parent 3389a7c
commit 530391c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/gui.c b/gui.c
@@ -36,6 +36,11 @@
 #include <proto/dos.h>
 #endif
 
+#ifdef WIN32
+#include <windows.h>
+#define WANT_WMINFO
+#endif
+
 #include "system.h"
 #include "6502.h"
 #include "via.h"
@@ -1103,6 +1108,8 @@ SDL_bool init_gui( struct machine *oric )
   }
   need_sdl_quit = SDL_TRUE;
 
+  SDL_WM_SetIcon( SDL_LoadBMP( IMAGEPREFIX"winicon.bmp" ), NULL );
+
   screen = SDL_SetVideoMode( 640, 480, 16, fullscreen ? SDL_FULLSCREEN : SDL_SWSURFACE );
   if( !screen )
   {

diff --git a/images/winicon.bmp b/images/winicon.bmp
diff --git a/winicon.ico b/winicon.ico