X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=8c0ddee1ec79d9452ec7f1a32dfc6f5ad10220c4;hp=b88fbeea4025cea2ff1a77cda0302b6afce9d15e;hb=HEAD;hpb=660f5e8b270182001d931f65fa03ff95819c3b92

diff --git a/win/makefile b/win/makefile
index b88fbee..8c0ddee 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,10 +1,9 @@
-# Copyright (C) 1998-2009 Index Data
-# All rights reserved.
+# 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 = 0 # Can be enabled Visual Studio 2005
 
 # YAZ
 YAZ_DIR=..\..\yaz
@@ -13,14 +12,6 @@ default: all
 
 all: dirs generated dll myclient zclient yaz
 
-NSIS="c:\program files\nsis\makensis-bz2.exe"
-
-nsis: all
-	$(NSIS) yazpp.nsi
-
-nsishelp:
-	$(NSIS)
-
 # Directories
 # The current directory is supposed to be something like
 # ..../yaz/win, everything is relative to that
@@ -34,9 +25,9 @@ SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
 ZOOMDIR=$(ROOTDIR)\zoom
 
 !if $(DEBUG)
-OBJDIR=$(WINDIR)\dobj       # where we store intermediate files
+OBJDIR=$(WINDIR)\dobj
 !else
-OBJDIR=$(WINDIR)\obj        # where we store intermediate files
+OBJDIR=$(WINDIR)\obj
 !endif
 
 TMPDIR=$(ROOTDIR)\win\tmp
@@ -45,13 +36,13 @@ TMP=$(TMPDIR)
 # Targets - what to make
 
 !if $(DEBUG)
-DLL=$(BINDIR)\yazpp3d.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp3d.lib
-YAZD=yaz3d
+DLL=$(BINDIR)\yazpp6d.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6d.lib
+YAZD=yaz5d
 !else
-DLL=$(BINDIR)\yazpp3.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp3.lib
-YAZD=yaz3
+DLL=$(BINDIR)\yazpp6.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6.lib
+YAZD=yaz5
 !endif
 
 ZCLIENT=$(BINDIR)\zclient.exe
@@ -115,7 +106,7 @@ LINK=link.exe
 
 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 $(MTOPT)
 
 DEBUG_LNK_OPTIONS= /debug 
 
@@ -127,19 +118,17 @@ CLIENT_LINK_OPTIONS = /subsystem:console
 # Final opt variables
 !if $(DEBUG)
 COPT=   $(COMMON_C_OPTIONS)   $(DEBUG_C_OPTIONS)     $(COMMON_C_INCLUDES)
-RCOPT=  $(COMMON_RC_OPTIONS)  $(DEBUG_RC_OPTIONS)
-LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS)   $(LNK_LIBS)
+LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS)
 
 !else
 COPT=   $(COMMON_C_OPTIONS)   $(RELEASE_C_OPTIONS)   $(COMMON_C_INCLUDES) 
-RCOPT=  $(COMMON_RC_OPTIONS)  $(RELEASE_RC_OPTIONS)
-LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
+LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS)
 !endif
 
 # Source and object modules
 
 DLL_OBJS = \
-   "$(OBJDIR)\bw.obj" \
+   "$(OBJDIR)\timestat.obj" \
    "$(OBJDIR)\gdu.obj" \
    "$(OBJDIR)\gduqueue.obj" \
    "$(OBJDIR)\limit-connect.obj" \
@@ -172,54 +161,28 @@ MY_CLIENT_OBJS = \
 ZCLIENT_OBJS = \
    "$(OBJDIR)\zclient.obj"
 
-# Note: This defines where to look for the necessary
-# source files. Funny way of doing it, but it works.
-
 {$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
 {$(ZOOMDIR)}.cpp{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
-### The RC compiler (resource files)
-RSC=rc.exe
-COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" 
-DEBUG_RC_OPTIONS=/d "_DEBUG"
-RELEASE_RC_OPTIONS=/d "NDEBUG"
-
-!if $(DEBUG)
-RSOPT=/d_DEBUG
-!else
-RSOPT=/d_NDEBUG
-!endif
-
-!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_PROGRAM) $(MY_CLIENT_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
 	$(LINK_PROGRAM) $(ZCLIENT_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 generated: $(ZOOMDIR)\zoom.h
 
 "$(ZOOMDIR)\zoom.h": "$(ZOOMDIR)\master-header"
-	sed "s/^*	/	/; s/^*/ /" "$(ZOOMDIR)\master-header" >"$(ZOOMDIR)\zoom.h"
+	sed "s/^*	/	/; s/^*/ /" < "$(ZOOMDIR)\master-header" >"$(ZOOMDIR)\zoom.h"
 
 clean:
 	-del $(BINDIR)\*.exe