Build Windows SDL target with icon.

indigoparadox · Dec 23, 2023 · 77ae60b · 77ae60b
1 parent ac9e651
commit 77ae60b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/make/Makeico.inc b/make/Makeico.inc
@@ -43,6 +43,21 @@ $$(OBJDIR_WATCOM386_WIN_GLUT)/$(1).rc: $$(OBJDIR_WATCOM386_WIN_GLUT)/$(1).ico
 $$(OBJDIR_WATCOM386_WIN_GLUT)/$(1).res: $$(OBJDIR_WATCOM386_WIN_GLUT)/$(1).rc
 	wrc -r $$< -bt=nt -fo=$$@
 
+# Watcom-Win-SDL
+
+# Don't use MAUG_DEPS since these have to be passed directly to the compiler.
+RES_WATCOM386_WIN_SDL_DEP=$$(OBJDIR_WATCOM386_WIN_SDL)/$(1).res
+RES_WATCOM386_WIN_SDL=resource {$$(RES_WATCOM386_WIN_SDL_DEP)}
+
+$$(OBJDIR_WATCOM386_WIN_SDL)/$(1).ico: $(1).bmp
+	convert "$$<" "$$@"
+
+$$(OBJDIR_WATCOM386_WIN_SDL)/$(1).rc: $$(OBJDIR_WATCOM386_WIN_SDL)/$(1).ico
+	echo "$$(WIN_ICO_RES_ID)   ICON   \"$$(OBJDIR_WATCOM386_WIN_SDL)/$(1).ico\"" > $$@
+
+$$(OBJDIR_WATCOM386_WIN_SDL)/$(1).res: $$(OBJDIR_WATCOM386_WIN_SDL)/$(1).rc
+	wrc -r $$< -bt=nt -fo=$$@
+
 # Watcom-Win-Win16
 
 RES_WATCOM_WIN_WIN16_DEP=$$(OBJDIR_WATCOM_WIN_WIN16)/$(1).res

diff --git a/src/retroflt.h b/src/retroflt.h
@@ -3615,6 +3615,9 @@ int retroflat_init( int argc, char* argv[], struct RETROFLAT_ARGS* args ) {
    info = SDL_GetVideoInfo();
    maug_cleanup_if_null_alloc( SDL_VideoInfo*, info );
 
+   debug_printf( 3, "maximum window size: %ux%u",
+      info->current_w, info->current_h );
+
    /* Setup default screen position. */
    if( 0 == args->screen_x ) {
       /* Get screen width so we can center! */