Added res-file to be linked in Windows build to show icon in Filemanager; converted icon file to be smaller

CHANGELOG.txt

@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20100821
 --------
 d1x-rebirth.ico, d1x-rebirth.xpm, arch/sdl/gr.c, arch/ogl/gr.c: Bind WM-Icon to application
+SConstruct, d1x-rebirth.bmp, d1x-rebirth.xpm, arch/sdl/gr.c, arch/ogl/gr.c, arch/win32/d1xr.res: Added res-file to be linked in Windows build to show icon in Filemanager; converted icon file to be smaller
 
 20100819
 --------

SConstruct

@@ -308,7 +308,7 @@ if sys.platform == 'win32':
 		common_sources += ['arch/win32/ipx.c']
 	ogllibs = ''
 	libs += ['glu32', 'wsock32', 'winmm', 'mingw32', 'SDLmain', 'SDL']
-	lflags = '-mwindows'
+	lflags = '-mwindows arch/win32/d1xr.res'
 elif sys.platform == 'darwin':
 	print "compiling on Mac OS X"
 	osdef = '__APPLE__'

arch/ogl/gr.c

@@ -73,7 +73,7 @@ int ogl_init_window(int x, int y)
 	}
 
 	SDL_WM_SetCaption(DESCENT_VERSION, "Descent");
-	SDL_WM_SetIcon( SDL_LoadBMP( "d1x-rebirth.ico" ), NULL );
+	SDL_WM_SetIcon( SDL_LoadBMP( "d1x-rebirth.bmp" ), NULL );
 	if (!SDL_SetVideoMode(x, y, GameArg.DbgBpp, SDL_OPENGL | (ogl_fullscreen ? SDL_FULLSCREEN : 0)))
 	{
 		Error("Could not set %dx%dx%d opengl video mode: %s\n", x, y, GameArg.DbgBpp, SDL_GetError());

arch/sdl/gr.c

@@ -99,7 +99,7 @@ int gr_set_mode(u_int32_t mode)
 	screen=NULL;
 
 	SDL_WM_SetCaption(DESCENT_VERSION, "Descent");
-	SDL_WM_SetIcon( SDL_LoadBMP( "d1x-rebirth.ico" ), NULL );
+	SDL_WM_SetIcon( SDL_LoadBMP( "d1x-rebirth.bmp" ), NULL );
 
 	if(SDL_VideoModeOK(w,h,GameArg.DbgBpp,sdl_video_flags))
 	{