X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=dd0f92acce0d02c1078ec6f299cc73d6a72edec4;hb=94971c9b5d09e3d8701ba43e9cca8168bc668e53;hp=ce31be2994d0bd45d7a7838b7500685f086aa19f;hpb=44ceeaf709eb733c9e10f8f7de06b62d36dead63;p=yazpp-moved-to-github.git diff --git a/win/makefile b/win/makefile index ce31be2..dd0f92a 100644 --- a/win/makefile +++ b/win/makefile @@ -1,6 +1,5 @@ -# Copyright (C) 1999-2006, Index Data ApS +# Copyright (C) 1998-2009 Index Data # All rights reserved. -# $Id: makefile,v 1.21 2008-02-21 10:16:26 adam Exp $ # Parameters @@ -46,13 +45,13 @@ TMP=$(TMPDIR) # Targets - what to make !if $(DEBUG) -DLL=$(BINDIR)\yazpp3d.dll -YAZPP_IMPLIB=$(LIBDIR)\yazpp3d.lib -YAZD=yaz3d +DLL=$(BINDIR)\yazpp4d.dll +YAZPP_IMPLIB=$(LIBDIR)\yazpp4d.lib +YAZD=yaz4d !else -DLL=$(BINDIR)\yazpp3.dll -YAZPP_IMPLIB=$(LIBDIR)\yazpp3.lib -YAZD=yaz3 +DLL=$(BINDIR)\yazpp4.dll +YAZPP_IMPLIB=$(LIBDIR)\yazpp4.lib +YAZD=yaz4 !endif ZCLIENT=$(BINDIR)\zclient.exe @@ -114,9 +113,7 @@ RELEASE_C_OPTIONS= \ ### Linker options LINK=link.exe -LINK_LIBS= kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \ - wsock32.lib advapi32.lib \ - $(YAZ_LIB) +LINK_LIBS= kernel32.lib advapi32.lib $(YAZ_LIB) COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no @@ -142,8 +139,10 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS) # Source and object modules DLL_OBJS = \ + "$(OBJDIR)\timestat.obj" \ "$(OBJDIR)\gdu.obj" \ "$(OBJDIR)\gduqueue.obj" \ + "$(OBJDIR)\limit-connect.obj" \ "$(OBJDIR)\pdu-observer.obj" \ "$(OBJDIR)\query.obj" \ "$(OBJDIR)\socket-observer.obj" \