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
Use entity idcommon rather than common
[yazpp-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
0697bfe
..
3782b96
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,6
+1,6
@@
# Copyright (C) 1999-2006, Index Data ApS
# All rights reserved.
# Copyright (C) 1999-2006, Index Data ApS
# All rights reserved.
-# $Id: makefile,v 1.17 2006-04-30 14:14:59 adam Exp $
+# $Id: makefile,v 1.19 2007-05-06 20:29:50 adam Exp $
# Parameters
# Parameters
@@
-45,13
+45,13
@@
TMP=$(TMPDIR)
# Targets - what to make
!if $(DEBUG)
# Targets - what to make
!if $(DEBUG)
-YAZPP_DLL=$(BINDIR)\yazpp_1_d.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp_1_d.lib
-YAZD=yazd
+YAZPP_DLL=$(BINDIR)\yazpp2d.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp2d.lib
+YAZD=yaz3d
!else
!else
-YAZPP_DLL=$(BINDIR)\yazpp_1.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp_1.lib
-YAZD=yaz
+YAZPP_DLL=$(BINDIR)\yazpp2.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp2.lib
+YAZD=yaz3
!endif
ZCLIENT=$(BINDIR)\zclient.exe
!endif
ZCLIENT=$(BINDIR)\zclient.exe
@@
-67,9
+67,9
@@
myclient: $(MY_CLIENT)
# YAZ includes & libs
YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib"
YAZ_DEF=/I"$(YAZ_DIR)\include"
# YAZ includes & libs
YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib"
YAZ_DEF=/I"$(YAZ_DIR)\include"
-yaz: $(BINDIR)\$(YAZD).dll $(BINDIR)\$(YAZD).dll
+yaz: $(BINDIR)\$(YAZD).dll
-$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll
+$(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll"
copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
COMMON_C_OPTIONS= \
copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
COMMON_C_OPTIONS= \