X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=25b78ccf30881132572cc76ec135980daab708e9;hp=3782b96b794da9c0ad1c64a2d7cdaebeca1ee16d;hb=d62e0baee8ee3cccced41746ef09fc3e01f401d5;hpb=11bd74f3063f71c59a09afd95e775fc810be563e

diff --git a/win/makefile b/win/makefile
index 3782b96..25b78cc 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,10 +1,10 @@
-# Copyright (C) 1999-2006, Index Data ApS
-# All rights reserved.
-# $Id: makefile,v 1.19 2007-05-06 20:29:50 adam Exp $
+# This file is part of the yazpp toolkit
+# Copyright (C) Index Data
+# See the file LICENSE for details.
 
 # Parameters 
-
 DEBUG=0   # 0 for release, 1 for debug
+USE_MANIFEST = 1 # Can be enabled Visual Studio 2005
 
 # YAZ
 YAZ_DIR=..\..\yaz
@@ -45,20 +45,20 @@ TMP=$(TMPDIR)
 # Targets - what to make
 
 !if $(DEBUG)
-YAZPP_DLL=$(BINDIR)\yazpp2d.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp2d.lib
-YAZD=yaz3d
+DLL=$(BINDIR)\yazpp6d.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6d.lib
+YAZD=yaz5d
 !else
-YAZPP_DLL=$(BINDIR)\yazpp2.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp2.lib
-YAZD=yaz3
+DLL=$(BINDIR)\yazpp6.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6.lib
+YAZD=yaz5
 !endif
 
 ZCLIENT=$(BINDIR)\zclient.exe
 MY_CLIENT=$(BINDIR)\yaz-my-client.exe
 
 # shortcut names defined here
-dll: $(YAZPP_DLL)
+dll: $(DLL)
 zclient: $(ZCLIENT)
 myclient: $(MY_CLIENT)
 
@@ -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 
 
@@ -140,9 +138,11 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
 
 # Source and object modules
 
-YAZPP_DLL_OBJS = \
+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" \
@@ -193,32 +193,28 @@ RSOPT=/d_DEBUG
 RSOPT=/d_NDEBUG
 !endif
 
-$(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS)
-	$(LINK) \
-		$(LNKOPT) \
-		$(LINK_LIBS) \
-		$(DLL_LINK_OPTIONS) \
-		$(YAZPP_DLL_OBJS) \
-		/out:"$(YAZPP_DLL)" \
-		/implib:"$(YAZPP_IMPLIB)" 
+!if $(USE_MANIFEST)
+MT=mt.exe /nologo
+!else
+MT=echo
+!endif
+
+
+LINK_DLL = $(LINK) $(LNKOPT) $(LINK_LIBS) $(DLL_LINK_OPTIONS)
+LINK_PROGRAM = $(LINK) $(LNKOPT) $(CLIENT_LINK_OPTIONS) $(LINK_LIBS) $(YAZPP_IMPLIB)
+
+
+$(DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(DLL_OBJS)
+	$(LINK_DLL) $(DLL_OBJS) /out:$@ /implib:"$(YAZPP_IMPLIB)" 
+	$(MT) -manifest $@.manifest -outputresource:$@;2
 
 $(MY_CLIENT) : "$(BINDIR)" $(MY_CLIENT_OBJS) $(YAZPP_IMPLIB)
-	$(LINK) \
-		$(LNKOPT) \
-		$(CLIENT_LINK_OPTIONS) \
-		$(LINK_LIBS)  \
-            	$(YAZPP_IMPLIB) \
-		$(MY_CLIENT_OBJS) \
-		/out:$(MY_CLIENT)
+	$(LINK_PROGRAM) $(MY_CLIENT_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
-	$(LINK) \
-        	$(LNKOPT) \
-		$(CLIENT_LINK_OPTIONS) \
-		$(LINK_LIBS) \
-		$(YAZPP_IMPLIB) \
-		$(ZCLIENT_OBJS) \
-		/out:$(ZCLIENT)
+	$(LINK_PROGRAM) $(ZCLIENT_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 generated: $(ZOOMDIR)\zoom.h