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
Bump version to 1.2.0
[yazpp-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
ce31be2
..
16c23c8
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,11
+1,10
@@
-# Copyright (C) 1999-2006, Index Data ApS
+# Copyright (C) 1998-2010 Index Data
# All rights reserved.
# All rights reserved.
-# $Id: makefile,v 1.21 2008-02-21 10:16:26 adam Exp $
# Parameters
DEBUG=0 # 0 for release, 1 for debug
# 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
# YAZ
YAZ_DIR=..\..\yaz
@@
-46,13
+45,13
@@
TMP=$(TMPDIR)
# Targets - what to make
!if $(DEBUG)
# 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
!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
!endif
ZCLIENT=$(BINDIR)\zclient.exe
@@
-114,9
+113,7
@@
RELEASE_C_OPTIONS= \
### Linker options
LINK=link.exe
### 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 /machine:i386 /incremental:no
@@
-142,8
+139,10
@@
LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
# Source and object modules
DLL_OBJS = \
# Source and object modules
DLL_OBJS = \
+ "$(OBJDIR)\timestat.obj" \
"$(OBJDIR)\gdu.obj" \
"$(OBJDIR)\gduqueue.obj" \
"$(OBJDIR)\gdu.obj" \
"$(OBJDIR)\gduqueue.obj" \
+ "$(OBJDIR)\limit-connect.obj" \
"$(OBJDIR)\pdu-observer.obj" \
"$(OBJDIR)\query.obj" \
"$(OBJDIR)\socket-observer.obj" \
"$(OBJDIR)\pdu-observer.obj" \
"$(OBJDIR)\query.obj" \
"$(OBJDIR)\socket-observer.obj" \