Added res-file to be linked in Windows build to show icon in Filemanager; converted icon file to be smaller
This commit is contained in:
parent
9a42f9ca8b
commit
6c61d30ffa
|
@ -3,6 +3,7 @@ D2X-Rebirth Changelog
|
|||
20100821
|
||||
--------
|
||||
d2x-rebirth.ico, d2x-rebirth.xpm, arch/sdl/gr.c, arch/ogl/gr.c: Bind WM-Icon to application
|
||||
SConstruct, d2x-rebirth.bmp, d2x-rebirth.xpm, arch/sdl/gr.c, arch/ogl/gr.c, arch/win32/d2xr.res: Added res-file to be linked in Windows build to show icon in Filemanager; converted icon file to be smaller
|
||||
|
||||
20100819
|
||||
--------
|
||||
|
|
|
@ -310,7 +310,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/d2xr.res'
|
||||
elif sys.platform == 'darwin':
|
||||
print "compiling on Mac OS X"
|
||||
osdef = '__APPLE__'
|
||||
|
|
|
@ -73,7 +73,7 @@ int ogl_init_window(int x, int y)
|
|||
}
|
||||
|
||||
SDL_WM_SetCaption(DESCENT_VERSION, "Descent II");
|
||||
SDL_WM_SetIcon( SDL_LoadBMP( "d2x-rebirth.ico" ), NULL );
|
||||
SDL_WM_SetIcon( SDL_LoadBMP( "d2x-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());
|
||||
|
|
|
@ -99,7 +99,7 @@ int gr_set_mode(u_int32_t mode)
|
|||
screen=NULL;
|
||||
|
||||
SDL_WM_SetCaption(DESCENT_VERSION, "Descent II");
|
||||
SDL_WM_SetIcon( SDL_LoadBMP( "d2x-rebirth.ico" ), NULL );
|
||||
SDL_WM_SetIcon( SDL_LoadBMP( "d2x-rebirth.bmp" ), NULL );
|
||||
|
||||
if(SDL_VideoModeOK(w,h,GameArg.DbgBpp,sdl_video_flags))
|
||||
{
|
||||
|
|
BIN
arch/win32/d2xr.res
Executable file
BIN
arch/win32/d2xr.res
Executable file
Binary file not shown.
BIN
d2x-rebirth.bmp
Normal file
BIN
d2x-rebirth.bmp
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.1 KiB |
BIN
d2x-rebirth.ico
BIN
d2x-rebirth.ico
Binary file not shown.
Before Width: | Height: | Size: 42 KiB |
Loading…
Reference in a new issue