Generate yaz3.dll version from yaz-version.h

diff --git a/win/makefile b/win/makefile
index 727a593..e9236a6 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1995-2007, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.138 2007-11-09 16:46:43 adam Exp $
+# $Id: makefile,v 1.139 2007-12-10 20:33:47 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -259,15 +259,11 @@ COMMON_TCL_OPTIONS= ..\util\yaz-asncomp -I$(INCLDIR) -i yaz
 # Final opt variables
 !if $(DEBUG)
 COPT=   $(COMMON_C_OPTIONS)   $(DEBUG_C_OPTIONS)     $(COMMON_C_INCLUDES)
-MTLOPT= $(COMMON_MTL_OPTIONS) $(DEBUG_MTL_OPTIONS)
-RCOPT=  $(COMMON_RC_OPTIONS)  $(DEBUG_RC_OPTIONS)
 LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS)   $(LNK_LIBS)
 TCLOPT= $(COMMON_TCL_OPTIONS)
 
 !else
 COPT=   $(COMMON_C_OPTIONS)   $(RELEASE_C_OPTIONS)   $(COMMON_C_INCLUDES) 
-MTLOPT= $(COMMON_MTL_OPTIONS) $(RELEASE_MTL_OPTIONS)
-RCOPT=  $(COMMON_RC_OPTIONS)  $(RELEASE_RC_OPTIONS)
 LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
 TCLOPT= $(COMMON_TCL_OPTIONS)
 !endif
@@ -738,7 +734,7 @@ RSOPT=/d_NDEBUG
 !endif
 
 $(YAZ_RES): $(YAZ_RC)
-       $(RSC) $(RSOPT) /fo"$(YAZ_RES)" $(YAZ_RC) 
+       $(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC) 
 
 # Linking
 

diff --git a/win/yaz.rc b/win/yaz.rc
index b69bf2b..3bcb7a1 100644 (file)
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -1,8 +1,9 @@
 #include "winver.h"
+#include "..\include\yaz\yaz-version.h"
 
 VS_VERSION_INFO VERSIONINFO 
-  FILEVERSION 3,0,17,1
-  PRODUCTVERSION  3,0,17,1
+  FILEVERSION YAZ_FILEVERSION
+  PRODUCTVERSION YAZ_FILEVERSION
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
   FILEFLAGS 0x1L
@@ -20,14 +21,14 @@ VS_VERSION_INFO VERSIONINFO
             VALUE "Comments", "Z39.50/SRU Library\0"
             VALUE "CompanyName", "Index Data ApS\0"
             VALUE "FileDescription", "YAZ Library\0"
-            VALUE "FileVersion", "3, 0, 17, 1\0"
+            VALUE "FileVersion", YAZ_VERSION "\0"
             VALUE "InternalName", "YAZ\0"
             VALUE "LegalCopyright", "Copyright © 1995-2007 Index Data ApS\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "yaz.rc\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "YAZ Toolkit\0"
-            VALUE "ProductVersion", "3, 0, 17, 1\0"
+            VALUE "ProductVersion", YAZ_VERSION "\0"
             VALUE "SpecialBuild", "\0"
         END
  }