projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let clean-local rule remove register files.
[idzebra-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
0bba74c
..
caee566
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# Zebra makefile for MS NMAKE
# Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.74 2008-01-17 21:48:36 adam Exp $
+# $Id: makefile,v 1.75 2008-01-18 11:33:36 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-46,7
+46,6
@@
ROOTDIR=.. # The home of zebra
# YAZ include files, libraries, etc.
YAZDIR=$(ROOTDIR)\..\yaz # or \program files\yaz
# YAZ include files, libraries, etc.
YAZDIR=$(ROOTDIR)\..\yaz # or \program files\yaz
-YAZINCL=$(YAZDIR)\include
YAZBINDIR=$(YAZDIR)\bin
!if $(DEBUG)
YAZLIB="$(YAZDIR)\lib\yaz3d.lib"
YAZBINDIR=$(YAZDIR)\bin
!if $(DEBUG)
YAZLIB="$(YAZDIR)\lib\yaz3d.lib"
@@
-123,8
+122,6
@@
DLL=$(BINDIR)\idzebra.dll
IMPLIB=$(LIBDIR)\idzebra.lib
!endif
IMPLIB=$(LIBDIR)\idzebra.lib
!endif
-ZEBRA_RES=$(OBJDIR)\idzebra.res
-
ZSERVER=$(BINDIR)\zebrasrv.exe
ZEBRAIDX=$(BINDIR)\zebraidx.exe
TSTFLOCK=$(BINDIR)\tstflock.exe
ZSERVER=$(BINDIR)\zebrasrv.exe
ZEBRAIDX=$(BINDIR)\zebraidx.exe
TSTFLOCK=$(BINDIR)\tstflock.exe
@@
-517,12
+514,28
@@
$(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS) $(IMPLIB)
$(TSTFLOCK_OBJS) \
/out:$(TSTFLOCK)
$(TSTFLOCK_OBJS) \
/out:$(TSTFLOCK)
-$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS)
+# Resources
+RES=$(OBJDIR)\zebra.res
+RC=$(WINDIR)\zebra.rc
+
+RSC=rc.exe
+!if $(DEBUG)
+RSOPT=/d_DEBUG
+!else
+RSOPT=/d_NDEBUG
+!endif
+
+
+$(RES): $(RC)
+ $(RSC) $(RSOPT) /I"../include" /I"$(YAZDIR)\include" /fo"$(RES)" $(RC)
+
+$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS) $(RES)
$(LINK) \
$(LNKOPT) \
$(LINK_LIBS) \
$(DLL_LINK_OPTIONS) \
$(ZEBRALIB_OBJS) \
$(LINK) \
$(LNKOPT) \
$(LINK_LIBS) \
$(DLL_LINK_OPTIONS) \
$(ZEBRALIB_OBJS) \
+ $(RES) \
/out:$(DLL) \
$(YAZLIB) \
/implib:"$(IMPLIB)" \
/out:$(DLL) \
$(YAZLIB) \
/implib:"$(IMPLIB)" \