From 3fb04115fcd8d00f6f697707701e375b3b5b95ae Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Wed, 9 Nov 2005 21:32:47 +0000 Subject: Fixes for building with MSVC-6/7. Added inet*.c. Replace with + (ala libcurl since IPv6 is not optional now). --- ares/vc/areslib/areslib.dsp | 62 ++++++++++++++++------ ares/vc/areslib/areslib.dsw | 29 ++++++++++ ares/vc/areslib/areslib.mak | 126 ++++++++++++++++++++++++++++++-------------- 3 files changed, 161 insertions(+), 56 deletions(-) create mode 100644 ares/vc/areslib/areslib.dsw diff --git a/ares/vc/areslib/areslib.dsp b/ares/vc/areslib/areslib.dsp index b108808a3..98e761523 100644 --- a/ares/vc/areslib/areslib.dsp +++ b/ares/vc/areslib/areslib.dsp @@ -7,19 +7,19 @@ CFG=areslib - 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 !MESSAGE NMAKE /f "areslib.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "areslib.mak" CFG="areslib - Win32 Debug" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "areslib - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "areslib - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_IOCTLSOCKET" /D "HAVE_STRUCT_IN6_ADDR" /D "HAVE_AF_INET6" /D "HAVE_STRUCT_SOCKADDR_IN6" /D "HAVE_STRUCT_ADDRINFO" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -63,8 +63,8 @@ LIB32=link.exe -lib # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_IOCTLSOCKET" /D "HAVE_STRUCT_IN6_ADDR" /D "HAVE_AF_INET6" /D "HAVE_STRUCT_SOCKADDR_IN6" /D "HAVE_STRUCT_ADDRINFO" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -74,7 +74,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ENDIF +!ENDIF # Begin Target @@ -97,6 +97,10 @@ SOURCE=..\..\ares__read_line.c # End Source File # Begin Source File +SOURCE=..\..\ares_cancel.c +# End Source File +# Begin Source File + SOURCE=..\..\ares_destroy.c # End Source File # Begin Source File @@ -137,6 +141,10 @@ SOURCE=..\..\ares_parse_a_reply.c # End Source File # Begin Source File +SOURCE=..\..\ares_parse_aaaa_reply.c +# End Source File +# Begin Source File + SOURCE=..\..\ares_parse_ptr_reply.c # End Source File # Begin Source File @@ -153,7 +161,15 @@ SOURCE=..\..\ares_search.c # End Source File # Begin Source File -SOURCE=..\..\ares_cancel.c +SOURCE=..\..\ares_send.c +# End Source File +# Begin Source File + +SOURCE=..\..\ares_strerror.c +# End Source File +# Begin Source File + +SOURCE=..\..\ares_timeout.c # End Source File # Begin Source File @@ -161,15 +177,15 @@ SOURCE=..\..\ares_version.c # End Source File # Begin Source File -SOURCE=..\..\ares_send.c +SOURCE=..\..\bitncmp.c # End Source File # Begin Source File -SOURCE=..\..\ares_strerror.c +SOURCE=..\..\inet_net_pton.c # End Source File # Begin Source File -SOURCE=..\..\ares_timeout.c +SOURCE=..\..\inet_ntop.c # End Source File # Begin Source File @@ -189,7 +205,7 @@ SOURCE=..\..\ares_dns.h # End Source File # Begin Source File -SOURCE=..\..\ares_version.h +SOURCE=..\..\ares_ipv6.h # End Source File # Begin Source File @@ -197,6 +213,22 @@ SOURCE=..\..\ares_private.h # End Source File # Begin Source File +SOURCE=..\..\ares_version.h +# End Source File +# Begin Source File + +SOURCE=..\..\bitncmp.h +# End Source File +# Begin Source File + +SOURCE=..\..\inet_net_pton.h +# End Source File +# Begin Source File + +SOURCE=..\..\inet_ntop.h +# End Source File +# Begin Source File + SOURCE=..\..\nameser.h # End Source File # End Group diff --git a/ares/vc/areslib/areslib.dsw b/ares/vc/areslib/areslib.dsw new file mode 100644 index 000000000..e732c9a21 --- /dev/null +++ b/ares/vc/areslib/areslib.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "areslib"=.\areslib.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/ares/vc/areslib/areslib.mak b/ares/vc/areslib/areslib.mak index 695673ce3..5f67a511b 100644 --- a/ares/vc/areslib/areslib.mak +++ b/ares/vc/areslib/areslib.mak @@ -2,28 +2,28 @@ !IF "$(CFG)" == "" CFG=areslib - Win32 Debug !MESSAGE No configuration specified. Defaulting to areslib - Win32 Debug. -!ENDIF +!ENDIF !IF "$(CFG)" != "areslib - Win32 Release" && "$(CFG)" != "areslib - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "areslib.mak" CFG="areslib - Win32 Debug" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "areslib - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "areslib - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE +!MESSAGE !ERROR An invalid configuration is specified. -!ENDIF +!ENDIF !IF "$(OS)" == "Windows_NT" NULL= -!ELSE +!ELSE NULL=nul -!ENDIF +!ENDIF CPP=cl.exe RSC=rc.exe @@ -43,6 +43,7 @@ CLEAN : -@erase "$(INTDIR)\ares__close_sockets.obj" -@erase "$(INTDIR)\ares__get_hostent.obj" -@erase "$(INTDIR)\ares__read_line.obj" + -@erase "$(INTDIR)\ares_cancel.obj" -@erase "$(INTDIR)\ares_destroy.obj" -@erase "$(INTDIR)\ares_expand_name.obj" -@erase "$(INTDIR)\ares_fds.obj" @@ -53,6 +54,7 @@ CLEAN : -@erase "$(INTDIR)\ares_init.obj" -@erase "$(INTDIR)\ares_mkquery.obj" -@erase "$(INTDIR)\ares_parse_a_reply.obj" + -@erase "$(INTDIR)\ares_parse_aaaa_reply.obj" -@erase "$(INTDIR)\ares_parse_ptr_reply.obj" -@erase "$(INTDIR)\ares_process.obj" -@erase "$(INTDIR)\ares_query.obj" @@ -60,6 +62,10 @@ CLEAN : -@erase "$(INTDIR)\ares_send.obj" -@erase "$(INTDIR)\ares_strerror.obj" -@erase "$(INTDIR)\ares_timeout.obj" + -@erase "$(INTDIR)\ares_version.obj" + -@erase "$(INTDIR)\bitncmp.obj" + -@erase "$(INTDIR)\inet_net_pton.obj" + -@erase "$(INTDIR)\inet_ntop.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(INTDIR)\windows_port.obj" -@erase "$(OUTDIR)\areslib.lib" @@ -67,13 +73,13 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_IOCTLSOCKET" /D "HAVE_STRUCT_IN6_ADDR" /D "HAVE_AF_INET6" /D "HAVE_STRUCT_SOCKADDR_IN6" /D "HAVE_STRUCT_ADDRINFO" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" +BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" BSC32_SBRS= \ - + LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib" +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib" LIB32_OBJS= \ "$(INTDIR)\ares__close_sockets.obj" \ "$(INTDIR)\ares__get_hostent.obj" \ @@ -97,7 +103,11 @@ LIB32_OBJS= \ "$(INTDIR)\ares_send.obj" \ "$(INTDIR)\ares_strerror.obj" \ "$(INTDIR)\ares_timeout.obj" \ - "$(INTDIR)\windows_port.obj" + "$(INTDIR)\windows_port.obj" \ + "$(INTDIR)\inet_ntop.obj" \ + "$(INTDIR)\inet_net_pton.obj" \ + "$(INTDIR)\bitncmp.obj" \ + "$(INTDIR)\ares_parse_aaaa_reply.obj" "$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) $(LIB32) @<< @@ -119,6 +129,7 @@ CLEAN : -@erase "$(INTDIR)\ares__close_sockets.obj" -@erase "$(INTDIR)\ares__get_hostent.obj" -@erase "$(INTDIR)\ares__read_line.obj" + -@erase "$(INTDIR)\ares_cancel.obj" -@erase "$(INTDIR)\ares_destroy.obj" -@erase "$(INTDIR)\ares_expand_name.obj" -@erase "$(INTDIR)\ares_fds.obj" @@ -129,15 +140,18 @@ CLEAN : -@erase "$(INTDIR)\ares_init.obj" -@erase "$(INTDIR)\ares_mkquery.obj" -@erase "$(INTDIR)\ares_parse_a_reply.obj" + -@erase "$(INTDIR)\ares_parse_aaaa_reply.obj" -@erase "$(INTDIR)\ares_parse_ptr_reply.obj" -@erase "$(INTDIR)\ares_process.obj" -@erase "$(INTDIR)\ares_query.obj" -@erase "$(INTDIR)\ares_search.obj" - -@erase "$(INTDIR)\ares_cancel.obj" - -@erase "$(INTDIR)\ares_version.obj" -@erase "$(INTDIR)\ares_send.obj" -@erase "$(INTDIR)\ares_strerror.obj" -@erase "$(INTDIR)\ares_timeout.obj" + -@erase "$(INTDIR)\ares_version.obj" + -@erase "$(INTDIR)\bitncmp.obj" + -@erase "$(INTDIR)\inet_net_pton.obj" + -@erase "$(INTDIR)\inet_ntop.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(INTDIR)\vc60.pdb" -@erase "$(INTDIR)\windows_port.obj" @@ -146,13 +160,13 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_IOCTLSOCKET" /D "HAVE_STRUCT_IN6_ADDR" /D "HAVE_AF_INET6" /D "HAVE_STRUCT_SOCKADDR_IN6" /D "HAVE_STRUCT_ADDRINFO" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" +BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" BSC32_SBRS= \ - + LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib" +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib" LIB32_OBJS= \ "$(INTDIR)\ares__close_sockets.obj" \ "$(INTDIR)\ares__get_hostent.obj" \ @@ -171,56 +185,62 @@ LIB32_OBJS= \ "$(INTDIR)\ares_process.obj" \ "$(INTDIR)\ares_query.obj" \ "$(INTDIR)\ares_search.obj" \ + "$(INTDIR)\ares_cancel.obj" \ + "$(INTDIR)\ares_version.obj" \ "$(INTDIR)\ares_send.obj" \ "$(INTDIR)\ares_strerror.obj" \ "$(INTDIR)\ares_timeout.obj" \ - "$(INTDIR)\windows_port.obj" + "$(INTDIR)\windows_port.obj" \ + "$(INTDIR)\inet_ntop.obj" \ + "$(INTDIR)\inet_net_pton.obj" \ + "$(INTDIR)\bitncmp.obj" \ + "$(INTDIR)\ares_parse_aaaa_reply.obj" "$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) $(LIB32) @<< $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) << -!ENDIF +!ENDIF .c{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cpp{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cxx{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .c{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cpp{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cxx{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << !IF "$(NO_EXTERNAL_DEPS)" != "1" !IF EXISTS("areslib.dep") !INCLUDE "areslib.dep" -!ELSE +!ELSE !MESSAGE Warning: cannot find "areslib.dep" -!ENDIF -!ENDIF +!ENDIF +!ENDIF !IF "$(CFG)" == "areslib - Win32 Release" || "$(CFG)" == "areslib - Win32 Debug" @@ -242,6 +262,12 @@ SOURCE=..\..\ares__read_line.c $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE=..\..\ares_cancel.c + +"$(INTDIR)\ares_cancel.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + SOURCE=..\..\ares_destroy.c "$(INTDIR)\ares_destroy.obj" : $(SOURCE) "$(INTDIR)" @@ -302,6 +328,12 @@ SOURCE=..\..\ares_parse_a_reply.c $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE=..\..\ares_parse_aaaa_reply.c + +"$(INTDIR)\ares_parse_aaaa_reply.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + SOURCE=..\..\ares_parse_ptr_reply.c "$(INTDIR)\ares_parse_ptr_reply.obj" : $(SOURCE) "$(INTDIR)" @@ -326,33 +358,45 @@ SOURCE=..\..\ares_search.c $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\..\ares_version.c +SOURCE=..\..\ares_send.c -"$(INTDIR)\ares_version.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\ares_send.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\..\ares_cancel.c +SOURCE=..\..\ares_strerror.c -"$(INTDIR)\ares_cancel.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\ares_strerror.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\..\ares_send.c +SOURCE=..\..\ares_timeout.c -"$(INTDIR)\ares_send.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\ares_timeout.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\..\ares_strerror.c +SOURCE=..\..\ares_version.c -"$(INTDIR)\ares_strerror.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\ares_version.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\..\ares_timeout.c +SOURCE=..\..\bitncmp.c -"$(INTDIR)\ares_timeout.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\bitncmp.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=..\..\inet_net_pton.c + +"$(INTDIR)\inet_net_pton.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=..\..\inet_ntop.c + +"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -363,5 +407,5 @@ SOURCE=..\..\windows_port.c -!ENDIF +!ENDIF -- cgit v1.2.3