X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=caee5666593e9c97878820f11f2ed7ea8b10c055;hb=b397f6feaa676b4b01f64d6278fb33075b78730f;hp=a65e64ed839b8b3b5dd3ef5178b5a3c56c09f006;hpb=28d1d00131b5e63828cf638ee1b971a348cd0d6d;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index a65e64e..caee566 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.73 2008-01-17 14:01:45 adam Exp $
+# $Id: makefile,v 1.75 2008-01-18 11:33:36 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -31,7 +31,7 @@ ZLIB_DIR = c:\zlib-1.2.3.win32
 
 # ICU support
 # get icu libraries from http://www.icu-project.org
-HAVE_LIBICU=1
+HAVE_ICU=1
 ICU_DIR=c:\icu
 
 
@@ -46,18 +46,17 @@ 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"
-!if $(HAVE_LIBICU)
+!if $(HAVE_ICU)
 YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3d.lib"
 !endif
 YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll"
 YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll"
 !else
 YAZLIB="$(YAZDIR)\lib\yaz3.lib"
-!if $(HAVE_LIBICU)
+!if $(HAVE_ICU)
 YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3.lib"
 !endif
 YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll"
@@ -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
@@ -200,7 +197,7 @@ libxslt:
 
 !endif
 
-!if $(HAVE_LIBICU)
+!if $(HAVE_ICU)
 ICU_DEF= /DYAZ_HAVE_ICU=1  /I"$(ICU_DIR)\include"
 ICU_LIB= $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
 icu: $(BINDIR)\icudt38.dll $(BINDIR)\icuin38.dll $(BINDIR)\icuuc38.dll
@@ -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)" \