X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=e9236a6a800c028aa7c86bc240f9785e4866d614;hb=6e325c841bbf92ba84e4a8361c8050a50943aa5c;hp=7c78c143281cf11207b9bbac66678686446004ac;hpb=bbd768abbf09c38b0438e0186e50f3560b372dd9;p=yaz-moved-to-github.git diff --git a/win/makefile b/win/makefile index 7c78c14..e9236a6 100644 --- a/win/makefile +++ b/win/makefile @@ -1,6 +1,6 @@ # Copyright (C) 1995-2007, Index Data ApS # All rights reserved. -# $Id: makefile,v 1.137 2007-10-24 13:50:04 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 @@ -439,7 +435,8 @@ MISC_OBJS= \ $(OBJDIR)\tokenizer.obj \ $(OBJDIR)\copy_types.obj \ $(OBJDIR)\http.obj \ - $(OBJDIR)\match_glob.obj + $(OBJDIR)\match_glob.obj \ + $(OBJDIR)\poll.obj Z3950_OBJS= \ $(OBJDIR)\z-date.obj\ @@ -737,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