projects
/
yazproxy-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f0845c4
)
Update to use proper libs
author
Adam Dickmeiss
<adam@indexdata.dk>
Sun, 30 Apr 2006 13:15:07 +0000
(13:15 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Sun, 30 Apr 2006 13:15:07 +0000
(13:15 +0000)
win/makefile
patch
|
blob
|
history
diff --git
a/win/makefile
b/win/makefile
index
2156e44
..
408b0de
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,6
+1,6
@@
# Copyright (C) 1993-2006, Index Data ApS
# All rights reserved.
# Copyright (C) 1993-2006, Index Data ApS
# All rights reserved.
-# $Id: makefile,v 1.5 2006-03-30 14:16:34 adam Exp $
+# $Id: makefile,v 1.6 2006-04-30 13:15:07 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-77,21
+77,31
@@
proxy: $(YAZPROXY)
############### Compiler and linker options
###########################################################
############### Compiler and linker options
###########################################################
-# YAZ include&libs
-YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
-YAZ_DEF=/I"$(YAZ_DIR)\include"
-yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
+!if $(DEBUG)
+YAZD=yazd
+YAZPPD=yazpp_1_d
+!else
+YAZD=yaz
+YAZPPD=yazpp_1
+!endif
+
+# YAZ includes & libs
+YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib"
+YAZ_DEF=/DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\include"
-$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll
- copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR)
+# Copy yaz.dll to our bin
+yaz: $(BINDIR)\$(YAZD).dll
+$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll
+ copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
-# YAZ++ include&libs
-YAZPP_LIB="$(YAZPP_DIR)\lib\yazpp.lib"
+# YAZ++ includes & libs
+YAZPP_LIB="$(YAZPP_DIR)\lib\$(YAZPPD).lib"
YAZPP_DEF=/I"$(YAZPP_DIR)\include"
YAZPP_DEF=/I"$(YAZPP_DIR)\include"
-yazpp: $(BINDIR)\yazpp.dll $(BINDIR)\yazpp.dll
-$(BINDIR)\yazpp.dll: $(YAZPP_DIR)\bin\yazpp.dll
- copy "$(YAZPP_DIR)\bin\yazpp.dll" $(BINDIR)
+# Copy yazpp.dll to our bin
+yazpp: $(BINDIR)\$(YAZPPD).dll
+$(BINDIR)\$(YAZPPD).dll: $(YAZPP_DIR)\bin\$(YAZPPD).dll
+ copy "$(YAZPP_DIR)\bin\$(YAZPPD).dll" $(BINDIR)
!if $(HAVE_ICONV)
ICONV_DEF= \
!if $(HAVE_ICONV)
ICONV_DEF= \