From ae3c0a40a6a02d0dc7748aba3816aa9ac73f4f67 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 18 Jan 2008 11:33:36 +0000 Subject: [PATCH] Added DLL resources (version, etc) to zebra.dll. --- win/makefile | 23 ++++++++++++++++++----- win/zebra.rc | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 win/zebra.rc diff --git a/win/makefile b/win/makefile index 0bba74c..caee566 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # Zebra makefile for MS NMAKE -# $Id: makefile,v 1.74 2008-01-17 21:48:36 adam Exp $ +# $Id: makefile,v 1.75 2008-01-18 11:33:36 adam Exp $ ########################################################### ############### Parameters @@ -46,7 +46,6 @@ ROOTDIR=.. # The home of zebra # YAZ include files, libraries, etc. YAZDIR=$(ROOTDIR)\..\yaz # or \program files\yaz -YAZINCL=$(YAZDIR)\include YAZBINDIR=$(YAZDIR)\bin !if $(DEBUG) YAZLIB="$(YAZDIR)\lib\yaz3d.lib" @@ -123,8 +122,6 @@ DLL=$(BINDIR)\idzebra.dll IMPLIB=$(LIBDIR)\idzebra.lib !endif -ZEBRA_RES=$(OBJDIR)\idzebra.res - ZSERVER=$(BINDIR)\zebrasrv.exe ZEBRAIDX=$(BINDIR)\zebraidx.exe TSTFLOCK=$(BINDIR)\tstflock.exe @@ -517,12 +514,28 @@ $(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS) $(IMPLIB) $(TSTFLOCK_OBJS) \ /out:$(TSTFLOCK) -$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS) +# Resources +RES=$(OBJDIR)\zebra.res +RC=$(WINDIR)\zebra.rc + +RSC=rc.exe +!if $(DEBUG) +RSOPT=/d_DEBUG +!else +RSOPT=/d_NDEBUG +!endif + + +$(RES): $(RC) + $(RSC) $(RSOPT) /I"../include" /I"$(YAZDIR)\include" /fo"$(RES)" $(RC) + +$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS) $(RES) $(LINK) \ $(LNKOPT) \ $(LINK_LIBS) \ $(DLL_LINK_OPTIONS) \ $(ZEBRALIB_OBJS) \ + $(RES) \ /out:$(DLL) \ $(YAZLIB) \ /implib:"$(IMPLIB)" \ diff --git a/win/zebra.rc b/win/zebra.rc new file mode 100644 index 0000000..ca15d68 --- /dev/null +++ b/win/zebra.rc @@ -0,0 +1,39 @@ +#include "winver.h" +#include "..\include\idzebra\version.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION ZEBRA_FILEVERSION + PRODUCTVERSION ZEBRA_FILEVERSION + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS_NT + FILETYPE VFT_DLL + FILESUBTYPE VFT2_UNKNOWN +{ + BLOCK "StringFileInfo" + { + BLOCK "000004b0" + BEGIN + VALUE "Comments", "http://www.indexdata.com/zebra/\0" + VALUE "CompanyName", "Index Data\0" + VALUE "FileDescription", "idzebra DLL\0" + VALUE "FileVersion", ZEBRAVER "\0" + VALUE "InternalName", "idzebra\0" + VALUE "LegalCopyright", "Copyright © 1995-2008 Index Data ApS\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "zebra.dll\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Zebra\0" + VALUE "ProductVersion", ZEBRAVER "\0" + VALUE "SpecialBuild", "\0" + END + } + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +} -- 1.7.10.4