X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=win%2Fmakefile;h=dd0f92acce0d02c1078ec6f299cc73d6a72edec4;hb=3cf85321afbedebddfc8b4aebe1b4a038d100d17;hp=b120b01cae913ec07cdda4d6eb6af366e78dc975;hpb=4b3585940162cf9ca65ca4a6914c0addcde50eef;p=yazpp-moved-to-github.git diff --git a/win/makefile b/win/makefile index b120b01..dd0f92a 100644 --- a/win/makefile +++ b/win/makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 Index Data +# Copyright (C) 1998-2009 Index Data # All rights reserved. # Parameters @@ -45,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 @@ -113,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 @@ -141,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" \