From 723cfceade0408bb88be87451f49d57aa8e38ccf Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Wed, 17 Sep 2014 14:54:00 +0200
Subject: win32: bring back the coq icon in the coqide binary

---
 Makefile.build | 4 ++++
 configure.ml   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.build b/Makefile.build
index 7b221cd829..c4fc69a59f 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -953,6 +953,10 @@ COND_OPTFLAGS= \
 	$(SHOW)'OCAMLC    $<'
 	$(HIDE)cd $(dir $<) && $(OCAMLC) -ccopt "$(CFLAGS)" -c $(notdir $<)
 
+%.o: %.rc
+	$(SHOW)'WINDRES    $<'
+	$(HIDE)i686-w64-mingw32-windres -i $< -o $@
+
 %.cmi: %.mli | %.mli.d
 	$(SHOW)'OCAMLC    $<'
 	$(HIDE)$(OCAMLC) $(COND_BYTEFLAGS) -c $<
diff --git a/configure.ml b/configure.ml
index 779f389b7e..6412a629ed 100644
--- a/configure.ml
+++ b/configure.ml
@@ -763,7 +763,7 @@ let coqide_flags () =
         idearchdef := "QUARTZ"
       end
     | "opt", "win32" ->
-      idearchfile := "ide/ide_win32_stubs.o";
+      idearchfile := "ide/ide_win32_stubs.o ide/coq_icon.o";
       idecdepsflags := "-custom";
       idearchflags := "-ccopt '-subsystem windows'";
       idearchdef := "WIN32"
-- 
cgit v1.2.3