On Windows, add icon and identifying meta-data to executable.

* Makefile (EXTRA_OBJS-y): New variable.
(WINDRES): New recipe.

* configure: Check for presence of windres,
and generate add_win_res variable in config.make.

* win/txr.xcf: New file: GIMP project for icon.

* win/txr.ico: New file: icon with three sizes generated
from GIMP project.

* win/txr.rc: New file.

6 files changed, 75 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5cc7be11..a6be3d8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2015-01-31  Kaz Kylheku  <kaz@kylheku.com>
+
+	On Windows, add icon and identifying meta-data to executable.
+
+	* Makefile (EXTRA_OBJS-y): New variable.
+	(WINDRES): New recipe.
+
+	* configure: Check for presence of windres,
+	and generate add_win_res variable in config.make.
+
+	* win/txr.xcf: New file: GIMP project for icon.
+
+	* win/txr.ico: New file: icon with three sizes generated
+	from GIMP project.
+
+	* win/txr.rc: New file.
+
 2015-01-29  Kaz Kylheku  <kaz@kylheku.com>
 
 	Use macro to initialize strm_ops.
diff --git a/Makefile b/Makefile
index 8cea7f4f..48a36fa5 100644
--- a/Makefile
+++ b/Makefile
@@ -41,12 +41,15 @@ ADD_CONF = $(addprefix $(1)/,$(2))
 EACH_CONF = $(foreach conf,opt dbg,$(call ADD_CONF,$(conf),$(1)))
 
 OBJS-y := # make sure OBJ-y is a value variable, not a macro variable
+EXTRA_OBJS-y :=
+
 OBJS := txr.o lex.yy.o y.tab.o match.o lib.o regex.o gc.o unwind.o stream.o
 OBJS += arith.o hash.o utf8.o filter.o eval.o rand.o combi.o sysif.o
 OBJS-$(debug_support) += debug.o
 OBJS-$(have_syslog) += syslog.o
 OBJS-$(have_glob) += glob.o
 OBJS-$(have_posix_sigs) += signal.o
+EXTRA_OBJS-$(add_win_res) += win/txr.res
 
 ifneq ($(have_git),)
 SRCS := $(addprefix $(top_srcdir)/,\
@@ -102,12 +105,24 @@ $(call ABBREV,LINK)
 $(V)$(CC) $(1) $(CFLAGS) -o $@ $^ -lm
 endef
 
+define WINDRES
+$(call ABBREV,RES)
+$(V)mkdir -p $(dir $@)
+$(V)windres -O coff -DTXR_VER=$(txr_ver) $< $@
+endef
+
 dbg/%.o: %.c
 	$(call COMPILE_C_WITH_DEPS,)
 
 opt/%.o: %.c
 	$(call COMPILE_C_WITH_DEPS,$(OPT_FLAGS))
 
+opt/%.res: win/%.rc
+	$(call WINDRES)
+
+%.res: %.rc
+	$(call WINDRES)
+
 # The following pattern rule is used for test targets built by configure
 %.o: %.c
 	$(call COMPILE_C)
@@ -122,10 +137,10 @@ endif
 .PHONY: all
 all: $(BUILD_TARGETS)
 
-$(PROG): $(OPT_OBJS)
+$(PROG): $(OPT_OBJS) $(EXTRA_OBJS-y)
 	$(call LINK_PROG,$(OPT_FLAGS))
 
-$(PROG)-dbg: $(DBG_OBJS)
+$(PROG)-dbg: $(DBG_OBJS) $(EXTRA_OBJS-y)
 	$(call LINK_PROG,)
 
 VPATH := $(top_srcdir)
diff --git a/configure b/configure
index 35112107..19f81957 100755
--- a/configure
+++ b/configure
@@ -119,6 +119,7 @@ have_timegm=
 have_syslog=
 have_glob=
 have_windows_h=
+have_windres=
 have_posix_sigs=
 need_darwin_c_source=
 have_git=
@@ -555,7 +556,7 @@ case "$top_srcdir" in
 esac
 
 if [ "$source_dir" != "." ] ; then
-  for x in Makefile share tests; do
+  for x in Makefile share tests win; do
     printf "Symlinking %s -> $source_dir/%s\n" $x $x
     ln -sf "$source_dir/$x" .
   done
@@ -641,6 +642,8 @@ EXE := $exe
 
 have_git := $have_git
 
+add_win_res := $([ -n "$have_windows_h" -a -n "$have_windres" ] && echo "y")
+
 CC := $cc
 LEX := $lex
 YACC := $yacc
@@ -1930,6 +1933,15 @@ else
   printf "no\n"
 fi
 
+printf "Checking for windres ... "
+
+if output=$(windres -V 2> /dev/null) ; then
+  printf "yes\n"
+  have_windres=y
+else
+  printf "no\n"
+fi
+
 #
 # Dependent variables
 #
diff --git a/win/txr.ico b/win/txr.ico
new file mode 100644
index 00000000..9f577771
--- /dev/null
+++ b/win/txr.ico
diff --git a/win/txr.rc b/win/txr.rc
new file mode 100644
index 00000000..6c1fbd30
--- /dev/null
+++ b/win/txr.rc
@@ -0,0 +1,28 @@
+#define XSTR(X) #X
+#define STR(X) XSTR(X)
+
+icon ICON "txr.ico"
+
+1 VERSIONINFO
+FILEVERSION     TXR_VER,0,0,0
+PRODUCTVERSION  TXR_VER,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "080904E4"
+    BEGIN
+      VALUE "CompanyName", "Kaz Kylheku"
+      VALUE "FileDescription", "TXR Language"
+      VALUE "InternalName", "txr"
+      VALUE "LegalCopyright", "Kaz Kylheku"
+      VALUE "OriginalFilename", "txr.exe"
+      VALUE "ProductName", "TXR Language"
+      VALUE "ProductVersion", STR(TXR_VER)
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x809, 1252
+  END
+END
diff --git a/win/txr.xcf b/win/txr.xcf
new file mode 100644
index 00000000..9231eed3
--- /dev/null
+++ b/win/txr.xcf