X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=641da64301dc6285410dd872da4e14548498785f;hb=ff61fa576933d620166732a19cd11a1c2a760914;hp=5056deb28b62d549262ff76b384a860b3dba4b02;hpb=ecf31b727a3af51c89a1aa7b67f6e1265a2ce73f;p=yazpp-moved-to-github.git diff --git a/win/makefile b/win/makefile index 5056deb..641da64 100644 --- a/win/makefile +++ b/win/makefile @@ -1,6 +1,6 @@ # Copyright (C) 1995-2005, Index Data ApS # All rights reserved. -# $Id: makefile,v 1.9 2005-11-03 14:48:06 adam Exp $ +# $Id: makefile,v 1.11 2006-04-30 05:52:06 adam Exp $ ########################################################### ############### Parameters @@ -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 @@ -68,7 +68,8 @@ $(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll copy "$(YAZ_DIR)\bin\yaz.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" \ @@ -111,7 +112,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 \