From 31a641171249300e29a02a6a01aa32c2af875cad Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Thu, 18 Jun 2009 16:02:25 +0000 Subject: [PATCH] - fix windows build of ddns-confgen - fix unix build of arpaname --- bin/confgen/win32/confgentool.dsp | 135 ++++++++++++++++++ bin/confgen/win32/confgentool.dsw | 29 ++++ bin/confgen/win32/ddnsconfgen.dsp | 24 +--- .../win32/{confgen.dsp => rndcconfgen.dsp} | 28 +--- .../win32/{confgen.dsw => rndcconfgen.dsw} | 2 +- .../win32/{confgen.mak => rndcconfgen.mak} | 37 +++-- bin/dnssec/win32/dnssectool.dsw | 2 +- bin/nsupdate/win32/nsupdate.mak | 4 +- bin/tools/Makefile.in | 6 +- bin/tools/arpaname.c | 6 +- win32utils/BINDBuild.dsw | 18 ++- win32utils/BuildAll.bat | 7 +- 12 files changed, 221 insertions(+), 77 deletions(-) create mode 100644 bin/confgen/win32/confgentool.dsp create mode 100644 bin/confgen/win32/confgentool.dsw rename bin/confgen/win32/{confgen.dsp => rndcconfgen.dsp} (80%) rename bin/confgen/win32/{confgen.dsw => rndcconfgen.dsw} (88%) rename bin/confgen/win32/{confgen.mak => rndcconfgen.mak} (99%) diff --git a/bin/confgen/win32/confgentool.dsp b/bin/confgen/win32/confgentool.dsp new file mode 100644 index 0000000000..c4f31b06ed --- /dev/null +++ b/bin/confgen/win32/confgentool.dsp @@ -0,0 +1,135 @@ +# Microsoft Developer Studio Project File - Name="confgentool" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static-Link Library" 0x0104 + +CFG=confgentool - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "confgentool.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "confgentool.mak" CFG="confgentool - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "confgentool - Win32 Release" (based on "Win32 (x86) Static-Link Library") +!MESSAGE "confgentool - Win32 Debug" (based on "Win32 (x86) Static-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "confgentool - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /YX /FD /c /Fdconfgentool +# SUBTRACT CPP /X +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 +# ADD LINK32 /out:"Release/confgentool.lib" +LIB32=lib.exe +# ADD BASE LIB32 +# ADD LIB32 /out:"Release/confgentool.lib" + +!ELSEIF "$(CFG)" == "confgentool - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR /YX /FD /GZ /c /Fdconfgentool +# SUBTRACT CPP /X +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 +# ADD LINK32 /debug /out:"Debug/confgentool.lib" +LIB32=lib.exe +# ADD BASE LIB32 +# ADD LIB32 /out:"Debug/confgentool.lib" + +!ENDIF + +# Begin Target + +# Name "confgentool - Win32 Release" +# Name "confgentool - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\keygen.h +# End Source File +# Begin Source File + +SOURCE=..\util.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# Begin Group "Main Dns Lib" + +# PROP Default_Filter "c" +# Begin Source File + +SOURCE=..\keygen.c +# End Source File +# Begin Source File + +SOURCE=..\util.c +# End Source File +# Begin Source File + +SOURCE=.\os.c +# End Source File +# End Group +# End Target +# End Project diff --git a/bin/confgen/win32/confgentool.dsw b/bin/confgen/win32/confgentool.dsw new file mode 100644 index 0000000000..5a2717476e --- /dev/null +++ b/bin/confgen/win32/confgentool.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "confgentool"=".\confgentool.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/bin/confgen/win32/ddnsconfgen.dsp b/bin/confgen/win32/ddnsconfgen.dsp index c739a02f6f..1fbcfccd50 100644 --- a/bin/confgen/win32/ddnsconfgen.dsp +++ b/bin/confgen/win32/ddnsconfgen.dsp @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/ddns-confgen.exe" +# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/confgentool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/ddns-confgen.exe" !ELSEIF "$(CFG)" == "ddnsconfgen - Win32 Debug" @@ -75,7 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/ddns-confgen.exe" /pdbtype:sept +# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/confgentool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/ddns-confgen.exe" /pdbtype:sept !ENDIF @@ -88,32 +88,12 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=.\os.c -# End Source File -# Begin Source File - -SOURCE=..\keygen.c -# End Source File -# Begin Source File - -SOURCE=..\util.c -# End Source File -# Begin Source File - SOURCE="..\ddns-confgen.c" # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\keygen.h -# End Source File -# Begin Source File - -SOURCE=..\util.h -# End Source File # End Group # Begin Group "Resource Files" diff --git a/bin/confgen/win32/confgen.dsp b/bin/confgen/win32/rndcconfgen.dsp similarity index 80% rename from bin/confgen/win32/confgen.dsp rename to bin/confgen/win32/rndcconfgen.dsp index 482ebb0898..b62e39deef 100644 --- a/bin/confgen/win32/confgen.dsp +++ b/bin/confgen/win32/rndcconfgen.dsp @@ -8,12 +8,12 @@ CFG=rndcconfgen - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "confgen.mak". +!MESSAGE NMAKE /f "rndcconfgen.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "confgen.mak" CFG="rndcconfgen - Win32 Debug" +!MESSAGE NMAKE /f "rndcconfgen.mak" CFG="rndcconfgen - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/rndc-confgen.exe" +# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/confgentool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/rndc-confgen.exe" !ELSEIF "$(CFG)" == "rndcconfgen - Win32 Debug" @@ -75,7 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept +# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/confgentool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept !ENDIF @@ -88,32 +88,12 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=.\os.c -# End Source File -# Begin Source File - -SOURCE=..\util.c -# End Source File -# Begin Source File - -SOURCE=..\keygen.c -# End Source File -# Begin Source File - SOURCE="..\rndc-confgen.c" # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\util.h -# End Source File -# Begin Source File - -SOURCE=..\keygen.h -# End Source File # End Group # Begin Group "Resource Files" diff --git a/bin/confgen/win32/confgen.dsw b/bin/confgen/win32/rndcconfgen.dsw similarity index 88% rename from bin/confgen/win32/confgen.dsw rename to bin/confgen/win32/rndcconfgen.dsw index 126090ebc9..2cc0d7c94d 100644 --- a/bin/confgen/win32/confgen.dsw +++ b/bin/confgen/win32/rndcconfgen.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "confgen"=".\confgen.dsp" - Package Owner=<4> +Project: "rndconfgen"=".\rndconfgen.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/bin/confgen/win32/confgen.mak b/bin/confgen/win32/rndcconfgen.mak similarity index 99% rename from bin/confgen/win32/confgen.mak rename to bin/confgen/win32/rndcconfgen.mak index ef3b84791a..43d1851927 100644 --- a/bin/confgen/win32/confgen.mak +++ b/bin/confgen/win32/rndcconfgen.mak @@ -9,7 +9,7 @@ CFG=rndcconfgen - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "confgen.mak" CFG="rndcconfgen - Win32 Debug" +!MESSAGE NMAKE /f "rndcconfgen.mak" CFG="rndcconfgen - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -276,24 +276,6 @@ SOURCE="..\rndc-confgen.c" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF - -SOURCE=..\util.c - -!IF "$(CFG)" == "rndcconfgen - Win32 Release" - - -"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "rndcconfgen - Win32 Debug" - - -"$(INTDIR)\util.obj" "$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - !ENDIF SOURCE=..\keygen.c @@ -314,6 +296,23 @@ SOURCE=..\keygen.c !ENDIF +SOURCE=..\util.c + +!IF "$(CFG)" == "rndcconfgen - Win32 Release" + + +"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "rndcconfgen - Win32 Debug" + + +"$(INTDIR)\util.obj" "$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF !ENDIF diff --git a/bin/dnssec/win32/dnssectool.dsw b/bin/dnssec/win32/dnssectool.dsw index 1049441806..703c508201 100644 --- a/bin/dnssec/win32/dnssectool.dsw +++ b/bin/dnssec/win32/dnssectool.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "dighost"=".\dnssectool.dsp" - Package Owner=<4> +Project: "dnssectool"=".\dnssectool.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/bin/nsupdate/win32/nsupdate.mak b/bin/nsupdate/win32/nsupdate.mak index 21d431ca3b..799f46ec21 100644 --- a/bin/nsupdate/win32/nsupdate.mak +++ b/bin/nsupdate/win32/nsupdate.mak @@ -143,7 +143,7 @@ LINK32_OBJS= \ "..\..\..\lib\dns\win32\Release\libdns.lib" \ "..\..\..\lib\isc\win32\Release\libisc.lib" \ "..\..\..\lib\bind9\win32\Release\libbind9.lib" \ - "..\..\..\lib\bind9\win32\Release\libisccfg.lib" + "..\..\..\lib\isccfg\win32\Release\libisccfg.lib" "..\..\..\Build\Release\nsupdate.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -205,7 +205,7 @@ LINK32_OBJS= \ "..\..\..\lib\dns\win32\Debug\libdns.lib" \ "..\..\..\lib\isc\win32\Debug\libisc.lib" \ "..\..\..\lib\bind9\win32\Debug\libbind9.lib" \ - "..\..\..\lib\bind9\win32\Release\libisccfg.lib" + "..\..\..\lib\isccfg\win32\Release\libisccfg.lib" "..\..\..\Build\Debug\nsupdate.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in index e47fd0f197..29b39d8dc3 100644 --- a/bin/tools/Makefile.in +++ b/bin/tools/Makefile.in @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.5 2009/03/23 21:59:56 each Exp $ +# $Id: Makefile.in,v 1.6 2009/06/18 16:02:25 each Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -50,8 +50,8 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @BIND9_MAKE_RULES@ -arpaname@EXEEXT@: journalprint.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ journalprint.@O@ \ +arpaname@EXEEXT@: arpaname.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ arpaname.@O@ \ ${DNSLIBS} ${ISCLIBS} ${LIBS} journalprint@EXEEXT@: journalprint.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ journalprint.@O@ \ diff --git a/bin/tools/arpaname.c b/bin/tools/arpaname.c index 5a8410394e..12c4fe9445 100644 --- a/bin/tools/arpaname.c +++ b/bin/tools/arpaname.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: arpaname.c,v 1.2 2009/03/04 02:23:36 marka Exp $ */ +/* $Id: arpaname.c,v 1.3 2009/06/18 16:02:25 each Exp $ */ #include "config.h" @@ -24,11 +24,15 @@ #include #include +#define UNUSED(x) (void)(x) + int main(int argc, char *argv[]) { unsigned char buf[16]; int i; + UNUSED(argc); + while (argv[1]) { if (inet_pton(AF_INET6, argv[1], buf) == 1) { for (i = 15; i >= 0; i--) diff --git a/win32utils/BINDBuild.dsw b/win32utils/BINDBuild.dsw index 5e601c79dc..03b7e0c5d1 100644 --- a/win32utils/BINDBuild.dsw +++ b/win32utils/BINDBuild.dsw @@ -375,7 +375,7 @@ Package=<4> ############################################################################### -Project: "rndcconfgen"="..\bin\confgen\win32\confgen.dsp" - Package Owner=<4> +Project: "rndcconfgen"="..\bin\confgen\win32\rndcconfgen.dsp" - Package Owner=<4> Package=<5> {{{ @@ -399,7 +399,7 @@ Package=<4> Project_Dep_Name libdns End Project Dependency Begin Project Dependency - Project_Dep_Name rndcutil + Project_Dep_Name confgentool End Project Dependency }}} @@ -420,7 +420,7 @@ Package=<4> Project_Dep_Name libdns End Project Dependency Begin Project Dependency - Project_Dep_Name rndcutil + Project_Dep_Name confgentool End Project Dependency }}} @@ -492,6 +492,18 @@ Package=<4> ############################################################################### +Project: "confgentool"="..\bin\confgen\win32\confgentool.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "checktool"="..\bin\check\win32\checktool.dsp" - Package Owner=<4> Package=<5> diff --git a/win32utils/BuildAll.bat b/win32utils/BuildAll.bat index e668de8b54..593375eebc 100644 --- a/win32utils/BuildAll.bat +++ b/win32utils/BuildAll.bat @@ -80,7 +80,12 @@ cd ..\.. cd rndc\win32 nmake /nologo -f rndc.mak CFG="rndc - Win32 Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f confgen.mak CFG="rndcconfgen - Win32 Release" NO_EXTERNAL_DEPS="1" + +cd ..\.. + +cd confgen\win32 +nmake /nologo -f rndcconfgen.mak CFG="rndcconfgen - Win32 Release" NO_EXTERNAL_DEPS="1" +nmake /nologo -f ddnsconfgen.mak CFG="ddnsconfgen - Win32 Release" NO_EXTERNAL_DEPS="1" cd ..\..