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
Update WIN32 with new source for virtual desctructors
[yazpp-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
b5ee8aa
..
5b00888
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,6
+1,6
@@
# Copyright (C) 1993-2004, Index Data ApS
# All rights reserved.
# Copyright (C) 1993-2004, Index Data ApS
# All rights reserved.
-# $Id: makefile,v 1.4 2004-04-11 17:49:36 adam Exp $
+# $Id: makefile,v 1.6 2005-09-22 12:47:33 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-9,7
+9,7
@@
DEBUG=0 # 0 for release, 1 for debug
# YAZ
DEBUG=0 # 0 for release, 1 for debug
# YAZ
-YAZ_DIR=c:\yaz
+YAZ_DIR=..\..\yaz
default: all
default: all
@@
-58,6
+58,7
@@
zclient: $(ZCLIENT)
############### Compiler and linker options
###########################################################
############### Compiler and linker options
###########################################################
+# YAZ includes & libs
YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
YAZ_DEF=/I"$(YAZ_DIR)\include"
yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
YAZ_DEF=/I"$(YAZ_DIR)\include"
yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
@@
-65,10
+66,6
@@
yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll
copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR)
$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll
copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR)
-### C and CPP compiler (the same thing)
-# Note: $(CPP) has already been defined in the environment
-# (if you set things up right!)
-
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
$(YAZ_DEF) \
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
$(YAZ_DEF) \
@@
-148,6
+145,10
@@
TCLOPT= $(COMMON_TCL_OPTIONS)
###########################################################
YAZPP_DLL_OBJS = \
###########################################################
YAZPP_DLL_OBJS = \
+ "$(OBJDIR)\socket-observer.obj" \
+ "$(OBJDIR)\pdu-observer.obj" \
+ "$(OBJDIR)\query.obj" \
+ "$(OBJDIR)\z-server.obj" \
"$(OBJDIR)\yaz-socket-manager.obj" \
"$(OBJDIR)\yaz-pdu-assoc.obj" \
"$(OBJDIR)\yaz-z-assoc.obj" \
"$(OBJDIR)\yaz-socket-manager.obj" \
"$(OBJDIR)\yaz-pdu-assoc.obj" \
"$(OBJDIR)\yaz-z-assoc.obj" \
@@
-235,7
+236,7
@@
$(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
###########################################################
###########################################################
-############### Generated SOurce files
+############### Generated Source files
###########################################################
generated: $(ZOOMDIR)\zoom.h
###########################################################
generated: $(ZOOMDIR)\zoom.h