From fe5e31a9e294669de982be03fd71990664a46476 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 18 Jan 2008 11:47:56 +0000
Subject: [PATCH] Added version resources for yaz_icu3.dll

---
 win/makefile |   14 ++++++++------
 win/yaz.rc   |   14 +++++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/win/makefile b/win/makefile
index aab1ff9..31527f9 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1995-2008, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.143 2008-01-17 22:27:40 adam Exp $
+# $Id: makefile,v 1.144 2008-01-18 11:47:56 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -765,12 +765,10 @@ $(SRCDIR)\cql.c: $(SRCDIR)\cql.y
 # Resources
 # The RC compiler (resource files)
 RSC=rc.exe
-COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" 
-DEBUG_RC_OPTIONS=/d "_DEBUG"
-RELEASE_RC_OPTIONS=/d "NDEBUG"
 
-YAZ_RES=$(OBJDIR)\yaz.res
 YAZ_RC=$(WINDIR)\yaz.rc
+YAZ_RES=$(OBJDIR)\yaz.res
+YAZ_ICU_RES=$(OBJDIR)\yaz_icu.res
 
 !if $(DEBUG)
 RSOPT=/d_DEBUG
@@ -781,6 +779,9 @@ RSOPT=/d_NDEBUG
 $(YAZ_RES): $(YAZ_RC)
 	$(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC) 
 
+$(YAZ_ICU_RES): $(YAZ_RC)
+	$(RSC) $(RSOPT) /DICU=1 /I"../include" /fo"$(YAZ_ICU_RES)" $(YAZ_RC) 
+
 # Linking
 
 $(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
@@ -791,9 +792,10 @@ $(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 		/implib:"$(YAZ_IMPLIB)" 
 	$(MT) -manifest $@.manifest -outputresource:$@;2
 
-$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_RES)
+$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
 	$(LINK_DLL) $(ICU_LIB) $(YAZ_IMPLIB)\
 		$(ICU_DLL_OBJS) \
+		$(YAZ_ICU_RES) \
 		/out:$@ \
 		/implib:"$(YAZ_ICU_IMPLIB)" 
 	$(MT) -manifest $@.manifest -outputresource:$@;2
diff --git a/win/yaz.rc b/win/yaz.rc
index 1506180..7f47264 100644
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -18,16 +18,20 @@ VS_VERSION_INFO VERSIONINFO
  {
         BLOCK "000004b0"
         BEGIN
-            VALUE "Comments", "Z39.50/SRU Library\0"
-            VALUE "CompanyName", "Index Data ApS\0"
-            VALUE "FileDescription", "YAZ Library\0"
+            VALUE "Comments", "http://www.indexdata.com/yaz/\0"
+            VALUE "CompanyName", "Index Data\0"
+#ifdef ICU
+            VALUE "FileDescription", "YAZ ICU DLL\0"
+#else
+            VALUE "FileDescription", "YAZ DLL\0"
+#endif
             VALUE "FileVersion", YAZ_VERSION "\0"
             VALUE "InternalName", "YAZ\0"
             VALUE "LegalCopyright", "Copyright © 1995-2008 Index Data ApS\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "yaz.rc\0"
+            VALUE "OriginalFilename", "yaz.res\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "YAZ Toolkit\0"
+            VALUE "ProductName", "YAZ\0"
             VALUE "ProductVersion", YAZ_VERSION "\0"
             VALUE "SpecialBuild", "\0"
         END
-- 
1.7.10.4