git.samba.org / tridge / bind9.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update to 9.7.1-P2
[tridge/bind9.git] / lib / isc / win32 / libisc.mak
diff --git a/lib/isc/win32/libisc.mak b/lib/isc/win32/libisc.mak
index 5ff2b199dd8ea950584b2356b26fc23c34722aa8..4bd5d1a78aa83ba0d3e5e7e7b2ba5a6ae9f7436f 100644 (file)
--- a/lib/isc/win32/libisc.mak
+++ b/lib/isc/win32/libisc.mak
@@ -28,6 +28,7 @@ NULL=nul
 CPP=cl.exe\r
 MTL=midl.exe\r
 RSC=rc.exe\r
+LIBXML=../../../../libxml2-2.7.3/win32/bin.msvc/libxml2.lib\r
 \r
 !IF  "$(CFG)" == "libisc - Win32 Release"\r
 _VC_MANIFEST_INC=0\r
@@ -115,6 +116,8 @@ ALL : "..\..\..\Build\Release\libisc.dll"
 CLEAN :\r
        -@erase "$(INTDIR)\app.obj"\r
        -@erase "$(INTDIR)\assertions.obj"\r
+       -@erase "$(INTDIR)\backtrace.obj"\r
+       -@erase "$(INTDIR)\backtrace-emptytbl.obj"\r
        -@erase "$(INTDIR)\base32.obj"\r
        -@erase "$(INTDIR)\base64.obj"\r
        -@erase "$(INTDIR)\bitstring.obj"\r
@@ -197,14 +200,14 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/noatomic/include" /I "win32" /I "../../isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/noatomic/include" /I "win32" /I "../../isccfg/include" /I "../../../../libxml2-2.7.3/include" /D "BIND9" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc" \r
 BSC32_SBRS= \\r
        \r
 LINK32=link.exe\r
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisc.pdb" /machine:I386 /def:".\libisc.def" /out:"../../../Build/Release/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" \r
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisc.pdb" /machine:I386 /def:".\libisc.def" /out:"../../../Build/Release/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" \r
 DEF_FILE= \\r
        ".\libisc.def"\r
 LINK32_OBJS= \\r
@@ -235,6 +238,8 @@ LINK32_OBJS= \
        "$(INTDIR)\version.obj" \\r
        "$(INTDIR)\win32os.obj" \\r
        "$(INTDIR)\assertions.obj" \\r
+       "$(INTDIR)\backtrace.obj" \\r
+       "$(INTDIR)\backtrace-emptytbl.obj" \\r
        "$(INTDIR)\base32.obj" \\r
        "$(INTDIR)\base64.obj" \\r
        "$(INTDIR)\bitstring.obj" \\r
@@ -306,6 +311,10 @@ CLEAN :
        -@erase "$(INTDIR)\app.sbr"\r
        -@erase "$(INTDIR)\assertions.obj"\r
        -@erase "$(INTDIR)\assertions.sbr"\r
+       -@erase "$(INTDIR)\backtrace.obj"\r
+       -@erase "$(INTDIR)\backtrace-emptytbl.obj"\r
+       -@erase "$(INTDIR)\backtrace.sbr"\r
+       -@erase "$(INTDIR)\backtrace-emptytbl.sbr"\r
        -@erase "$(INTDIR)\base32.obj"\r
        -@erase "$(INTDIR)\base32.sbr"\r
        -@erase "$(INTDIR)\base64.obj"\r
@@ -466,7 +475,7 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/noatomic/include" /I "win32" /I "../../isccfg/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/noatomic/include" /I "win32" /I "../../isccfg/include" /I "../../../../libxml2-2.7.3/include" /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc" \r
@@ -498,6 +507,8 @@ BSC32_SBRS= \
        "$(INTDIR)\version.sbr" \\r
        "$(INTDIR)\win32os.sbr" \\r
        "$(INTDIR)\assertions.sbr" \\r
+       "$(INTDIR)\backtrace.sbr" \\r
+       "$(INTDIR)\backtrace-emptytbl.sbr" \\r
        "$(INTDIR)\base32.sbr" \\r
        "$(INTDIR)\base64.sbr" \\r
        "$(INTDIR)\bitstring.sbr" \\r
@@ -553,7 +564,7 @@ BSC32_SBRS= \
 <<\r
 \r
 LINK32=link.exe\r
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisc.pdb" /map:"$(INTDIR)\libisc.map" /debug /machine:I386 /def:".\libisc.def" /out:"../../../Build/Debug/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" /pdbtype:sept \r
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisc.pdb" /map:"$(INTDIR)\libisc.map" /debug /machine:I386 /def:".\libisc.def" /out:"../../../Build/Debug/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" /pdbtype:sept \r
 DEF_FILE= \\r
        ".\libisc.def"\r
 LINK32_OBJS= \\r
@@ -584,6 +595,8 @@ LINK32_OBJS= \
        "$(INTDIR)\version.obj" \\r
        "$(INTDIR)\win32os.obj" \\r
        "$(INTDIR)\assertions.obj" \\r
+       "$(INTDIR)\backtrace.obj" \\r
+       "$(INTDIR)\backtrace-emptytbl.obj" \\r
        "$(INTDIR)\base32.obj" \\r
        "$(INTDIR)\base64.obj" \\r
        "$(INTDIR)\bitstring.obj" \\r
@@ -1099,6 +1112,42 @@ SOURCE=..\assertions.c
        $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
+!ENDIF \r
+\r
+SOURCE=..\backtrace.c\r
+\r
+!IF  "$(CFG)" == "libisc - Win32 Release"\r
+\r
+\r
+"$(INTDIR)\backtrace.obj" : $(SOURCE) "$(INTDIR)"\r
+       $(CPP) $(CPP_PROJ) $(SOURCE)\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"\r
+\r
+\r
+"$(INTDIR)\backtrace.obj"      "$(INTDIR)\backtrace.sbr" : $(SOURCE) "$(INTDIR)"\r
+       $(CPP) $(CPP_PROJ) $(SOURCE)\r
+\r
+\r
+!ENDIF \r
+\r
+SOURCE=..\backtrace-emptytbl.c\r
+\r
+!IF  "$(CFG)" == "libisc - Win32 Release"\r
+\r
+\r
+"$(INTDIR)\backtrace-emptytbl.obj" : $(SOURCE) "$(INTDIR)"\r
+       $(CPP) $(CPP_PROJ) $(SOURCE)\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"\r
+\r
+\r
+"$(INTDIR)\backtrace-emptytbl.obj"     "$(INTDIR)\backtrace-emptytbl.sbr" : $(SOURCE) "$(INTDIR)"\r
+       $(CPP) $(CPP_PROJ) $(SOURCE)\r
+\r
+\r
 !ENDIF \r
 \r
 SOURCE=..\base32.c\r
bind9 repo for testing against Samba4