X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=9678ae6b4ff3330ee6b6345af5c0e666438f6e2c;hb=876d1f923efd4054054e745c56794e1fc356d7bd;hp=b06a6cbdedc50af064a956950161db4f65873ffc;hpb=44672975f94d9b1c3975fbae4452c07bd9578269;p=yazpp-moved-to-github.git diff --git a/win/makefile b/win/makefile index b06a6cb..9678ae6 100644 --- a/win/makefile +++ b/win/makefile @@ -1,6 +1,6 @@ -# Copyright (C) 1993-2004, Index Data ApS +# Copyright (C) 1995-2006, Index Data ApS # All rights reserved. -# $Id: makefile,v 1.5 2004-04-11 17:53:03 adam Exp $ +# $Id: makefile,v 1.14 2006-04-30 09:07:43 adam Exp $ ########################################################### ############### Parameters @@ -9,11 +9,11 @@ DEBUG=0 # 0 for release, 1 for debug # YAZ -YAZ_DIR=c:\yaz +YAZ_DIR=..\..\yaz default: all -all: dirs generated dll zclient yaz +all: dirs generated dll myclient zclient yaz NSIS="c:\program files\nsis\makensis-bz2.exe" @@ -28,7 +28,7 @@ nsishelp: ########################################################### # The current directory is supposed to be something like # ..../yaz/win, everything is relative to that -ROOTDIR=.. # The home of yaz++ +ROOTDIR=.. # The home of yazpp INCLDIR=$(ROOTDIR)\include # our includes LIBDIR=$(ROOTDIR)\lib # We produce .lib, .exp etc there @@ -36,7 +36,6 @@ BINDIR=$(ROOTDIR)\bin # We produce exes and dlls there WINDIR=$(ROOTDIR)\win # all these Win make things OBJDIR=$(WINDIR)\obj # where we store intermediate files SRCDIR=$(ROOTDIR)\src # for the case we move them under src -PROXYDIR=$(ROOTDIR)\proxy ZOOMDIR=$(ROOTDIR)\zoom TMPDIR=$(ROOTDIR)\win\tmp @@ -46,28 +45,39 @@ TMP=$(TMPDIR) ############### Targets - what to make ########################################################### +!if $(DEBUG) +YAZPP_DLL=$(BINDIR)\yazppd.dll +YAZPP_IMPLIB=$(LIBDIR)\yazppd.lib +YAZD=yazd +!else YAZPP_DLL=$(BINDIR)\yazpp.dll YAZPP_IMPLIB=$(LIBDIR)\yazpp.lib +YAZD=yaz +!endif + ZCLIENT=$(BINDIR)\zclient.exe +MY_CLIENT=$(BINDIR)\yaz-my-client.exe # shortcut names defined here dll: $(YAZPP_DLL) zclient: $(ZCLIENT) +myclient: $(MY_CLIENT) ########################################################### ############### Compiler and linker options ########################################################### # YAZ includes & libs -YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib" +YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib" YAZ_DEF=/I"$(YAZ_DIR)\include" -yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll +yaz: $(BINDIR)\$(YAZD).dll $(BINDIR)\$(YAZD).dll -$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll - copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR) +$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll + copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR) COMMON_C_OPTIONS= \ - /nologo /W3 /GX /FD /c \ + /nologo /W3 /EHsc /FD /c \ + /D "_CRT_SECURE_NO_DEPRECATE" \ $(YAZ_DEF) \ /D "_WINDOWS" \ /D "WIN32" \ @@ -81,7 +91,7 @@ COMMON_C_INCLUDES= \ DEBUG_C_OPTIONS= \ /D "_DEBUG" \ - /MDd /Od /YX /Zi /Gm + /MDd /Od /Zi /Gm RELEASE_C_OPTIONS= \ /D "NDEBUG" \ @@ -98,7 +108,6 @@ RELEASE_C_OPTIONS= \ # /MDd = Runtime library: Multithread DLL (debug) # /Od = Disable optimising (debug) # /O2 = Optimize for speed -# /YX = Automatic use of precomipled headers # /Gm = Minimal rebuild (some cpp class stuff) # /Zi = Program database for debuggers # /ZI = Pgm database with special "edit&continue" stuff - not available in C5 @@ -110,7 +119,7 @@ LINK=link.exe LINK_LIBS= kernel32.lib user32.lib gdi32.lib \ advapi32.lib uuid.lib \ wsock32.lib advapi32.lib \ - $(YAZ_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) + $(YAZ_LIB) COMMON_LNK_OPTIONS= /nologo \ /subsystem:windows \ @@ -127,17 +136,13 @@ CLIENT_LINK_OPTIONS = /subsystem:console # Final opt variables !if $(DEBUG) COPT= $(COMMON_C_OPTIONS) $(DEBUG_C_OPTIONS) $(COMMON_C_INCLUDES) -MTLOPT= $(COMMON_MTL_OPTIONS) $(DEBUG_MTL_OPTIONS) RCOPT= $(COMMON_RC_OPTIONS) $(DEBUG_RC_OPTIONS) LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS) $(LNK_LIBS) -TCLOPT= $(COMMON_TCL_OPTIONS) !else COPT= $(COMMON_C_OPTIONS) $(RELEASE_C_OPTIONS) $(COMMON_C_INCLUDES) -MTLOPT= $(COMMON_MTL_OPTIONS) $(RELEASE_MTL_OPTIONS) RCOPT= $(COMMON_RC_OPTIONS) $(RELEASE_RC_OPTIONS) LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS) -TCLOPT= $(COMMON_TCL_OPTIONS) !endif ########################################################### @@ -145,6 +150,12 @@ TCLOPT= $(COMMON_TCL_OPTIONS) ########################################################### YAZPP_DLL_OBJS = \ + "$(OBJDIR)\gdu.obj" \ + "$(OBJDIR)\gduqueue.obj" \ + "$(OBJDIR)\pdu-observer.obj" \ + "$(OBJDIR)\query.obj" \ + "$(OBJDIR)\socket-observer.obj" \ + "$(OBJDIR)\z-server.obj" \ "$(OBJDIR)\yaz-socket-manager.obj" \ "$(OBJDIR)\yaz-pdu-assoc.obj" \ "$(OBJDIR)\yaz-z-assoc.obj" \ @@ -164,6 +175,9 @@ YAZPP_DLL_OBJS = \ "$(OBJDIR)\zrs.obj" \ "$(OBJDIR)\zrec.obj" +MY_CLIENT_OBJS = \ + "$(OBJDIR)\yaz-my-client.obj" + ZCLIENT_OBJS = \ "$(OBJDIR)\zclient.obj" @@ -215,7 +229,18 @@ $(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS) $(YAZPP_DLL_OBJS) /out:"$(YAZPP_DLL)" /implib:"$(YAZPP_IMPLIB)" - /map:"$(LIBDIR)\yazpp.map" +<< + +$(MY_CLIENT) : "$(BINDIR)" $(MY_CLIENT_OBJS) $(YAZPP_IMPLIB) + @echo Linking $(MY_CLIENT) + $(LINK) @<< + $(LNKOPT) + $(CLIENT_LINK_OPTIONS) + $(LINK_LIBS) + $(YAZPP_IMPLIB) + $(MY_CLIENT_OBJS) + /map:"$(LIBDIR)\yaz-my-client.map" + /out:$(MY_CLIENT) << $(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB) @@ -252,11 +277,6 @@ clean: realclean: clean -del $(ZOOMDIR)\zoom.h -# Because DOS del will only accept one file name to delete, -# the _H_ files work only on sets that have just one file. -# Z3950_H_FILES had to be spelled out. One more point for MS! - -########### check directories and create if needed dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR) $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):