Make win32 version use 'icon32x32.png' as SDL window icon.

Fix 'starter' images directory for win32.
This commit is contained in:
John Popplewell 2004-09-17 13:39:35 +00:00
parent fd455ea70a
commit d0edcec0a7

View file

@ -5642,7 +5642,7 @@ void seticon(void)
#ifndef WIN32 #ifndef WIN32
icon = IMG_Load(DATA_PREFIX "images/icon.png"); icon = IMG_Load(DATA_PREFIX "images/icon.png");
#else #else
icon = IMG_Load(DATA_PREFIX "images/icon-win32.png"); icon = IMG_Load(DATA_PREFIX "images/icon32x32.png");
#endif #endif
if (icon == NULL) if (icon == NULL)
@ -9781,7 +9781,11 @@ int do_open(int want_new_tool)
/* Check for coloring-book style 'starter' images first: */ /* Check for coloring-book style 'starter' images first: */
/* FIXME: On Windows, MacOSX, BeOS, etc. -- do it their way! */ /* FIXME: On Windows, MacOSX, BeOS, etc. -- do it their way! */
#ifdef WIN32
dirname[places_to_look] = strdup(DATA_PREFIX "starters");
#else
dirname[places_to_look] = strdup("/usr/local/share/tuxpaint/starters"); dirname[places_to_look] = strdup("/usr/local/share/tuxpaint/starters");
#endif
} }
else else
{ {