From 02d3c452e4c6ceabd264b993f7d59edad0b82b6d Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 13 Jun 2009 00:52:48 +0000 Subject: DEBUGBUILD symbol definition for debug builds --- ares/Makefile.dj | 5 +++++ ares/Makefile.vc6 | 2 +- ares/vc/acountry/acountry.dsp | 4 ++-- ares/vc/adig/adig.dsp | 4 ++-- ares/vc/ahost/ahost.dsp | 4 ++-- ares/vc/areslib/areslib.dsp | 4 ++-- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ares/Makefile.dj b/ares/Makefile.dj index 7f29e2649..c146b2126 100644 --- a/ares/Makefile.dj +++ b/ares/Makefile.dj @@ -35,6 +35,11 @@ CFLAGS += -DWATT32 -DHAVE_AF_INET6 -DHAVE_PF_INET6 -DHAVE_IOCTLSOCKET \ LDFLAGS = -s ifeq ($(USE_DEBUG),1) + CFLAGS += -DDEBUGBUILD +endif + +ifeq ($(USE_CURLDEBUG),1) + CFLAGS += -DCURLDEBUG EX_LIBS = ../lib/libcurl.a OBJ_HACK = $(OBJECTS) else diff --git a/ares/Makefile.vc6 b/ares/Makefile.vc6 index 14711bda6..7fb63d457 100644 --- a/ares/Makefile.vc6 +++ b/ares/Makefile.vc6 @@ -35,7 +35,7 @@ EX_LIBS = advapi32.lib ws2_32.lib !endif !if "$(DEBUG_MODEL)" == "d" -CFLAGS = $(CFLAGS) -D_DEBUG -GZ +CFLAGS = $(CFLAGS) -DDEBUGBUILD -D_DEBUG -GZ LDFLAGS = $(LDFLAGS) -debug -fixed:no !else diff --git a/ares/vc/acountry/acountry.dsp b/ares/vc/acountry/acountry.dsp index 9442f5072..1e0632c1f 100644 --- a/ares/vc/acountry/acountry.dsp +++ b/ares/vc/acountry/acountry.dsp @@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "DEBUGBUILD" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "DEBUGBUILD" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/ares/vc/adig/adig.dsp b/ares/vc/adig/adig.dsp index 757d7bb54..3a7545591 100644 --- a/ares/vc/adig/adig.dsp +++ b/ares/vc/adig/adig.dsp @@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "DEBUGBUILD" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D /D "DEBUGBUILD" "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/ares/vc/ahost/ahost.dsp b/ares/vc/ahost/ahost.dsp index 914eb6e4d..bfadce2b0 100644 --- a/ares/vc/ahost/ahost.dsp +++ b/ares/vc/ahost/ahost.dsp @@ -65,8 +65,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "DEBUGBUILD" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "DEBUGBUILD" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/ares/vc/areslib/areslib.dsp b/ares/vc/areslib/areslib.dsp index 8a8624bd9..ce84fb9fa 100644 --- a/ares/vc/areslib/areslib.dsp +++ b/ares/vc/areslib/areslib.dsp @@ -63,8 +63,8 @@ LIB32=link.exe -lib # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "DEBUGBUILD" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "DEBUGBUILD" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe -- cgit v1.2.3