X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=da4b817d45f1b36501fcf482d4e7d131f471483f;hb=6716ec7295c7361a205cb2dbcd5c8e3af64e8df6;hp=b120b01cae913ec07cdda4d6eb6af366e78dc975;hpb=4b3585940162cf9ca65ca4a6914c0addcde50eef;p=yazpp-moved-to-github.git diff --git a/win/makefile b/win/makefile index b120b01..da4b817 100644 --- a/win/makefile +++ b/win/makefile @@ -1,10 +1,10 @@ -# Copyright (C) 1998-2008 Index Data +# Copyright (C) 1998-2012 Index Data # All rights reserved. # Parameters DEBUG=0 # 0 for release, 1 for debug -USE_MANIFEST = 0 # Can be enabled Visual Studio 2005 +USE_MANIFEST = 1 # Can be enabled Visual Studio 2005 # YAZ YAZ_DIR=..\..\yaz @@ -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,11 +113,9 @@ 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 +COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no DEBUG_LNK_OPTIONS= /debug @@ -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" \