projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update doc/common
[yazpp-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
da4b817
..
83ddb2e
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,10
+1,10
@@
-# Copyright (C) 1998-2012 Index Data
-# All rights reserved.
+# This file is part of the yazpp toolkit
+# Copyright (C) Index Data
+# See the file LICENSE for details.
# Parameters
# Parameters
-
DEBUG=0 # 0 for release, 1 for debug
DEBUG=0 # 0 for release, 1 for debug
-USE_MANIFEST = 1 # Can be enabled Visual Studio 2005
+USE_MANIFEST = 1 # Can be enabled Visual Studio 2005, 2008
# YAZ
YAZ_DIR=..\..\yaz
# YAZ
YAZ_DIR=..\..\yaz
@@
-13,14
+13,6
@@
default: all
all: dirs generated dll myclient zclient yaz
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
# Directories
# The current directory is supposed to be something like
# ..../yaz/win, everything is relative to that
@@
-45,13
+37,13
@@
TMP=$(TMPDIR)
# Targets - what to make
!if $(DEBUG)
# Targets - what to make
!if $(DEBUG)
-DLL=$(BINDIR)\yazpp4d.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp4d.lib
-YAZD=yaz4d
+DLL=$(BINDIR)\yazpp6d.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6d.lib
+YAZD=yaz5d
!else
!else
-DLL=$(BINDIR)\yazpp4.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp4.lib
-YAZD=yaz4
+DLL=$(BINDIR)\yazpp6.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6.lib
+YAZD=yaz5
!endif
ZCLIENT=$(BINDIR)\zclient.exe
!endif
ZCLIENT=$(BINDIR)\zclient.exe
@@
-115,7
+107,7
@@
LINK=link.exe
LINK_LIBS= kernel32.lib advapi32.lib $(YAZ_LIB)
LINK_LIBS= kernel32.lib advapi32.lib $(YAZ_LIB)
-COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no $(MTOPT)
DEBUG_LNK_OPTIONS= /debug
DEBUG_LNK_OPTIONS= /debug
@@
-195,8
+187,10
@@
RSOPT=/d_NDEBUG
!if $(USE_MANIFEST)
MT=mt.exe /nologo
!if $(USE_MANIFEST)
MT=mt.exe /nologo
+MTOPT=/manifest
!else
MT=echo
!else
MT=echo
+MTOPT=
!endif
!endif
@@
-219,12
+213,13
@@
$(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
generated: $(ZOOMDIR)\zoom.h
"$(ZOOMDIR)\zoom.h": "$(ZOOMDIR)\master-header"
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
-del $(BINDIR)\*.dll
-del $(TMPDIR)\*.
clean:
-del $(BINDIR)\*.exe
-del $(BINDIR)\*.dll
-del $(TMPDIR)\*.
+ -del $(BINDIR)\*.manifest
-del $(LIBDIR)\*.LIB
-del $(OBJDIR)\*.OBJ
-del $(LIBDIR)\*.LIB
-del $(OBJDIR)\*.OBJ