From 4d49566a3ee78ec5027f3447996ead020a212df5 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 13 Jun 2009 00:52:48 +0000 Subject: [PATCH] DEBUGBUILD symbol definition for debug builds --- Makefile.dj | 5 +++++ Makefile.vc6 | 2 +- vc/acountry/acountry.dsp | 4 ++-- vc/adig/adig.dsp | 4 ++-- vc/ahost/ahost.dsp | 4 ++-- vc/areslib/areslib.dsp | 4 ++-- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile.dj b/Makefile.dj index 7f29e26..c146b21 100644 --- a/Makefile.dj +++ b/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/Makefile.vc6 b/Makefile.vc6 index 14711bd..7fb63d4 100644 --- a/Makefile.vc6 +++ b/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/vc/acountry/acountry.dsp b/vc/acountry/acountry.dsp index 9442f50..1e0632c 100644 --- a/vc/acountry/acountry.dsp +++ b/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/vc/adig/adig.dsp b/vc/adig/adig.dsp index 757d7bb..3a75455 100644 --- a/vc/adig/adig.dsp +++ b/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/vc/ahost/ahost.dsp b/vc/ahost/ahost.dsp index 914eb6e..bfadce2 100644 --- a/vc/ahost/ahost.dsp +++ b/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/vc/areslib/areslib.dsp b/vc/areslib/areslib.dsp index 8a8624b..ce84fb9 100644 --- a/vc/areslib/areslib.dsp +++ b/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 -- 2.7.4