projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added yaz_daemoon for windows.
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
ba84e9c
..
97136b0
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,6
+1,6
@@
-# Copyright (C) 1995-2007, Index Data ApS
+# Copyright (C) 1995-2008, Index Data ApS
# All rights reserved.
# All rights reserved.
-# $Id: makefile,v 1.142 2008-01-14 22:58:46 adam Exp $
+# $Id: makefile,v 1.145 2008-02-21 10:15:31 adam Exp $
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
@@
-479,6
+479,7
@@
MISC_OBJS= \
$(OBJDIR)\http.obj \
$(OBJDIR)\match_glob.obj \
$(OBJDIR)\poll.obj \
$(OBJDIR)\http.obj \
$(OBJDIR)\match_glob.obj \
$(OBJDIR)\poll.obj \
+ $(OBJDIR)\daemon.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
@@
-765,12
+766,10
@@
$(SRCDIR)\cql.c: $(SRCDIR)\cql.y
# Resources
# The RC compiler (resource files)
RSC=rc.exe
# Resources
# 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"
-YAZ_RES=$(OBJDIR)\yaz.res
YAZ_RC=$(WINDIR)\yaz.rc
YAZ_RC=$(WINDIR)\yaz.rc
+YAZ_RES=$(OBJDIR)\yaz.res
+YAZ_ICU_RES=$(OBJDIR)\yaz_icu.res
!if $(DEBUG)
RSOPT=/d_DEBUG
!if $(DEBUG)
RSOPT=/d_DEBUG
@@
-781,6
+780,9
@@
RSOPT=/d_NDEBUG
$(YAZ_RES): $(YAZ_RC)
$(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC)
$(YAZ_RES): $(YAZ_RC)
$(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC)
+$(YAZ_ICU_RES): $(YAZ_RC)
+ $(RSC) $(RSOPT) /DICU=1 /I"../include" /fo"$(YAZ_ICU_RES)" $(YAZ_RC)
+
# Linking
$(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
# Linking
$(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
@@
-791,9
+793,10
@@
$(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
/implib:"$(YAZ_IMPLIB)"
$(MT) -manifest $@.manifest -outputresource:$@;2
/implib:"$(YAZ_IMPLIB)"
$(MT) -manifest $@.manifest -outputresource:$@;2
-$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_RES)
+$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
$(LINK_DLL) $(ICU_LIB) $(YAZ_IMPLIB)\
$(ICU_DLL_OBJS) \
$(LINK_DLL) $(ICU_LIB) $(YAZ_IMPLIB)\
$(ICU_DLL_OBJS) \
+ $(YAZ_ICU_RES) \
/out:$@ \
/implib:"$(YAZ_ICU_IMPLIB)"
$(MT) -manifest $@.manifest -outputresource:$@;2
/out:$@ \
/implib:"$(YAZ_ICU_IMPLIB)"
$(MT) -manifest $@.manifest -outputresource:$@;2