From 647e6ebe5859a56efa8a164f3264003920d85da3 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Tue, 10 Mar 2015 23:35:43 +0100
Subject: added SciTECO icon and compile it into Windows binaries

 * sciteco.ico contains a 16 color 16px, a 255 color 32px and
   a true color 48px version of the icon.
   The first ones are good for legacy Windows versions like 2000,
   while the latter one should be preferred by Windows >= 7.
 * Also added the 48px version as a PNG for Linux.
   But it is not installed currently, as there is no standardized
   place for it and it wouldn't do much good in /usr/share/sciteco.
---
 configure.ac       |  12 ++++++++++++
 ico/sciteco-48.png | Bin 0 -> 9379 bytes
 ico/sciteco.ico    | Bin 0 -> 12206 bytes
 src/Makefile.am    |   8 ++++++++
 src/sciteco.rc     |   4 ++++
 5 files changed, 24 insertions(+)
 create mode 100644 ico/sciteco-48.png
 create mode 100644 ico/sciteco.ico
 create mode 100644 src/sciteco.rc

diff --git a/configure.ac b/configure.ac
index 3ddf295..fe06358 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,18 @@ AC_PROG_INSTALL
 # Required by the Scintilla build process:
 AC_CHECK_TOOL(AR, ar)
 
+# Check for Windows resource compiler and define
+# WIN32 conditional
+case $host in
+*-mingw*)
+	LT_LANG([Windows Resource])
+	AM_CONDITIONAL(WIN32, [true])
+	;;
+*)
+	AM_CONDITIONAL(WIN32, [false])
+	;;
+esac
+
 # Emscripten uses Clang as well
 AM_CONDITIONAL(CLANG, [$CXX --version | $GREP -E "clang|Emscripten" >/dev/null])
 
diff --git a/ico/sciteco-48.png b/ico/sciteco-48.png
new file mode 100644
index 0000000..37423cc
Binary files /dev/null and b/ico/sciteco-48.png differ
diff --git a/ico/sciteco.ico b/ico/sciteco.ico
new file mode 100644
index 0000000..e36a6ab
Binary files /dev/null and b/ico/sciteco.ico differ
diff --git a/src/Makefile.am b/src/Makefile.am
index 692ac1d..739aefd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,10 +68,18 @@ sciteco_minimal_LDADD = libsciteco-base.a \
 			@SCINTILLA_PATH@/bin/scintilla.a
 
 bin_PROGRAMS = sciteco
+sciteco_SOURCES =
 nodist_sciteco_SOURCES = $(nodist_sciteco_minimal_SOURCES) \
 			 symbols-scintilla.cpp symbols-scilexer.cpp
 sciteco_LDADD = $(sciteco_minimal_LDADD)
 
+# For MinGW: Compile in resource (contains the icon)
+if WIN32
+sciteco_SOURCES += sciteco.rc
+.rc.o:
+	@RC@ $< $@
+endif
+
 CLEANFILES = $(BUILT_SOURCES) \
 	     symbols-scintilla.cpp symbols-scilexer.cpp
 
diff --git a/src/sciteco.rc b/src/sciteco.rc
new file mode 100644
index 0000000..66646ae
--- /dev/null
+++ b/src/sciteco.rc
@@ -0,0 +1,4 @@
+/*
+ * This will be SciTECO's application icon:
+ */
+DEFAULT ICON "../ico/sciteco.ico"
-- 
cgit v1.2.3