changes needed for windows build

diff --git a/bin/confgen/win32/confgen.dsp b/bin/confgen/win32/confgen.dsp
index 0f224de7e93d9d5eb02e3ebb21ccd1f9a49505b0..482ebb08985e3c6cf9a497862a1ec816e8e09e42 100644 (file)
--- a/bin/confgen/win32/confgen.dsp
+++ b/bin/confgen/win32/confgen.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 Release/util.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 ../../../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 Debug/util.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 ../../../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 
 
@@ -92,6 +92,14 @@ 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
@@ -102,6 +110,10 @@ SOURCE="..\rndc-confgen.c"
 
 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.mak b/bin/confgen/win32/confgen.mak
index fe0f1df177b143168c64718db21ed421f59c9879..ef3b84791a6d978b62b76740eecf4e92e3b9918e 100644 (file)
--- a/bin/confgen/win32/confgen.mak
+++ b/bin/confgen/win32/confgen.mak
@@ -114,6 +114,7 @@ ALL : "..\..\..\Build\Release\rndc-confgen.exe"
 CLEAN :
        -@erase "$(INTDIR)\os.obj"
        -@erase "$(INTDIR)\rndc-confgen.obj"
+       -@erase "$(INTDIR)\keygen.obj"
        -@erase "$(INTDIR)\util.obj"
        -@erase "$(INTDIR)\vc60.idb"
        -@erase "..\..\..\Build\Release\rndc-confgen.exe"
@@ -132,6 +133,7 @@ LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/l
 LINK32_OBJS= \
        "$(INTDIR)\os.obj" \
        "$(INTDIR)\rndc-confgen.obj" \
+       "$(INTDIR)\keygen.obj" \
        "$(INTDIR)\util.obj"
 
 "..\..\..\Build\Release\rndc-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -156,6 +158,8 @@ CLEAN :
        -@erase "$(INTDIR)\os.sbr"
        -@erase "$(INTDIR)\rndc-confgen.obj"
        -@erase "$(INTDIR)\rndc-confgen.sbr"
+       -@erase "$(INTDIR)\keygen.obj"
+       -@erase "$(INTDIR)\keygen.sbr"
        -@erase "$(INTDIR)\util.obj"
        -@erase "$(INTDIR)\util.sbr"
        -@erase "$(INTDIR)\vc60.idb"
@@ -175,6 +179,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\confgen.bsc"
 BSC32_SBRS= \
        "$(INTDIR)\os.sbr" \
        "$(INTDIR)\rndc-confgen.sbr" \
+       "$(INTDIR)\keygen.sbr" \
        "$(INTDIR)\util.sbr"
 
 "$(OUTDIR)\confgen.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
@@ -187,6 +192,7 @@ LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/lib
 LINK32_OBJS= \
        "$(INTDIR)\os.obj" \
        "$(INTDIR)\rndc-confgen.obj" \
+       "$(INTDIR)\keygen.obj" \
        "$(INTDIR)\util.obj"
 
 "..\..\..\Build\Debug\rndc-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -288,6 +294,24 @@ SOURCE=..\util.c
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
+SOURCE=..\keygen.c
+
+!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+
+
+"$(INTDIR)\keygen.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+
+
+"$(INTDIR)\keygen.obj" "$(INTDIR)\keygen.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 !ENDIF 
 
 

diff --git a/bin/confgen/win32/ddnsconfgen.dsp b/bin/confgen/win32/ddnsconfgen.dsp
index dcaf3e3db3e2fece73f2e1613ec4a3cccad5ecd1..c739a02f6fe1dade60e4fd0fb41fca7f6f3b01e3 100644 (file)
--- 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 Release/util.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 ../../../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 Debug/util.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 ../../../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 
 
@@ -92,6 +92,14 @@ 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
@@ -100,6 +108,10 @@ SOURCE="..\ddns-confgen.c"
 # 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

diff --git a/bin/confgen/win32/ddnsconfgen.mak b/bin/confgen/win32/ddnsconfgen.mak
index 9805f46580ae4d4168c6527467817434295219b8..b98ccd053a8fe1ca8806bf2adf11734aadee830b 100644 (file)
--- a/bin/confgen/win32/ddnsconfgen.mak
+++ b/bin/confgen/win32/ddnsconfgen.mak
@@ -114,6 +114,7 @@ ALL : "..\..\..\Build\Release\ddns-confgen.exe"
 CLEAN :
        -@erase "$(INTDIR)\os.obj"
        -@erase "$(INTDIR)\ddns-confgen.obj"
+       -@erase "$(INTDIR)\keygen.obj"
        -@erase "$(INTDIR)\util.obj"
        -@erase "$(INTDIR)\vc60.idb"
        -@erase "..\..\..\Build\Release\ddns-confgen.exe"
@@ -132,6 +133,7 @@ LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/l
 LINK32_OBJS= \
        "$(INTDIR)\os.obj" \
        "$(INTDIR)\ddns-confgen.obj" \
+       "$(INTDIR)\keygen.obj" \
        "$(INTDIR)\util.obj"
 
 "..\..\..\Build\Release\ddns-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -156,6 +158,8 @@ CLEAN :
        -@erase "$(INTDIR)\os.sbr"
        -@erase "$(INTDIR)\ddns-confgen.obj"
        -@erase "$(INTDIR)\ddns-confgen.sbr"
+       -@erase "$(INTDIR)\keygen.obj"
+       -@erase "$(INTDIR)\keygen.sbr"
        -@erase "$(INTDIR)\util.obj"
        -@erase "$(INTDIR)\util.sbr"
        -@erase "$(INTDIR)\vc60.idb"
@@ -175,6 +179,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\ddnsconfgen.bsc"
 BSC32_SBRS= \
        "$(INTDIR)\os.sbr" \
        "$(INTDIR)\ddns-confgen.sbr" \
+       "$(INTDIR)\keygen.sbr" \
        "$(INTDIR)\util.sbr"
 
 "$(OUTDIR)\ddnsconfgen.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
@@ -187,6 +192,7 @@ LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/lib
 LINK32_OBJS= \
        "$(INTDIR)\os.obj" \
        "$(INTDIR)\ddns-confgen.obj" \
+       "$(INTDIR)\keygen.obj" \
        "$(INTDIR)\util.obj"
 
 "..\..\..\Build\Debug\ddns-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -270,6 +276,24 @@ SOURCE="..\ddns-confgen.c"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
+SOURCE=..\keygen.c
+
+!IF  "$(CFG)" == "ddnsconfgen - Win32 Release"
+
+
+"$(INTDIR)\keygen.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "ddnsconfgen - Win32 Debug"
+
+
+"$(INTDIR)\keygen.obj" "$(INTDIR)\keygen.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 !ENDIF 
 
 SOURCE=..\util.c