[LyX/master] Use the same icon as in the cmake build

Enrico Forestieri forenr at lyx.org
Wed Jun 17 17:30:42 UTC 2020


commit 70ccf9f243ea4020bcd392c25af31be90ac7d341
Author: Enrico Forestieri <forenr at lyx.org>
Date:   Wed Jun 17 19:52:27 2020 +0200

    Use the same icon as in the cmake build
---
 development/Makefile.am |    1 +
 src/Makefile.am         |    3 ++-
 src/lyxwinres.rc        |    4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/development/Makefile.am b/development/Makefile.am
index 2bbb764..fc9aa90 100644
--- a/development/Makefile.am
+++ b/development/Makefile.am
@@ -29,6 +29,7 @@ tools/count_total_lines_of_compiled_code.sh \
 tools/count_lines_of_included_code.sh \
 tools/lyxeditor \
 Win32/packaging/icons/Lydia.svg \
+Win32/packaging/icons/lyx_doc.ico \
 Win32/packaging/icons/lyx_doc.svg \
 Win32/packaging/icons/lyx_32x32.png \
 Win32/packaging/icons/lyx_doc_32x32.png \
diff --git a/src/Makefile.am b/src/Makefile.am
index f6a77dc..4a74c6e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,8 @@ lyx_LDADD = \
 
 if LYX_WIN_RESOURCE
 .rc.o:
-	cp $(top_srcdir)/development/Win32/packaging/icons/lyx_*32x32.ico .
+	cp $(top_srcdir)/development/Win32/packaging/icons/lyx.ico .
+	cp $(top_srcdir)/development/Win32/packaging/icons/lyx_doc.ico .
 	$(RC) -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
 endif
 
diff --git a/src/lyxwinres.rc b/src/lyxwinres.rc
index b09b74a..7f71321 100644
--- a/src/lyxwinres.rc
+++ b/src/lyxwinres.rc
@@ -1,6 +1,6 @@
 /* Icons */
-IDI_ICON1 ICON DISCARDABLE    "lyx_32x32.ico"
-IDI_ICON2 ICON DISCARDABLE    "lyx_doc_32x32.ico"
+IDI_ICON1 ICON DISCARDABLE    "lyx.ico"
+IDI_ICON2 ICON DISCARDABLE    "lyx_doc.ico"
 
 #include "config.h"
 #include <winver.h>


More information about the lyx-cvs mailing list