|
From: <co...@us...> - 2025-02-21 10:51:00
|
Revision: 45501
http://sourceforge.net/p/vice-emu/code/45501
Author: compyx
Date: 2025-02-21 10:50:59 +0000 (Fri, 21 Feb 2025)
Log Message:
-----------
Fix icon linking on Windows for SDL
Seems we *did* already use icons for the Windows SDL UI, using the logic
in `gtk3/data/win32` to generate the icons. Updated build files to use the
proper `win32_res_files` rule in `data/common/Makefile.am` (when not building
headless).
Modified Paths:
--------------
trunk/vice/data/common/Makefile.am
trunk/vice/src/arch/gtk3/data/win32/Makefile.am
trunk/vice/src/arch/sdl/Makefile.am
Modified: trunk/vice/data/common/Makefile.am
===================================================================
--- trunk/vice/data/common/Makefile.am 2025-02-21 08:25:03 UTC (rev 45500)
+++ trunk/vice/data/common/Makefile.am 2025-02-21 10:50:59 UTC (rev 45501)
@@ -204,10 +204,12 @@
$(logo_files) \
$(font_files)
endif
+endif
+# Windows .res and .ico files (for Gtk3 and SDL)
if WINDOWS_COMPILE
+if !USE_HEADLESSUI
-# Windows .res files
if SUPPORT_X64
X64_RES=x64.res
else
@@ -239,10 +241,13 @@
xscpu64.ico: $(icons_win32_xscpu64)
xvic.ico: $(icons_win32_xvic)
+# if !USE_HEADLESSUI
+endif
# if WINDOWS_COMPILE
endif
+if USE_GTK3UI
# Generate gresource binary file, required by all Gtk3 emus
$(GRESOURCE_TARGET): $(GRESOURCE_XML)
glib-compile-resources --sourcedir $(top_srcdir) $< --target $@
@@ -251,7 +256,7 @@
if INSTALL_DESKTOP_FILES
-.PHONY: install-icons install-desktop-files uinstall-icons
+.PHONY: install-icons install-desktop-files uinstall-icons
# Install icon files in their proper place. The default context is 'apps' and
# the default mode is 'system' when running as root and 'user' when not running
Modified: trunk/vice/src/arch/gtk3/data/win32/Makefile.am
===================================================================
--- trunk/vice/src/arch/gtk3/data/win32/Makefile.am 2025-02-21 08:25:03 UTC (rev 45500)
+++ trunk/vice/src/arch/gtk3/data/win32/Makefile.am 2025-02-21 10:50:59 UTC (rev 45501)
@@ -1,4 +1,5 @@
if WINDOWS_COMPILE
+if USE_GTK3UI
# Create Windows .ico files
#
@@ -12,3 +13,4 @@
(cd $(top_builddir)/data/common && $(MAKE) win32_res_files)
endif
+endif
Modified: trunk/vice/src/arch/sdl/Makefile.am
===================================================================
--- trunk/vice/src/arch/sdl/Makefile.am 2025-02-21 08:25:03 UTC (rev 45500)
+++ trunk/vice/src/arch/sdl/Makefile.am 2025-02-21 10:50:59 UTC (rev 45501)
@@ -264,9 +264,9 @@
if WINDOWS_COMPILE
-# Use Gtk's icon stuff to generate icon sets
+# Generate icons
all:
- (cd ../gtk3/data/win32 && $(MAKE))
+ (cd $(top_builddir)/data/common && $(MAKE) win32_res_files)
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|