Commit 7eb59de7 authored by Yang Tse's avatar Yang Tse
Browse files

DEBUGBUILD / CURLDEBUG decoupling follow-up

parent 5931cf77

lib/Makefile.vc6

+2 −2
Original line number Diff line number Diff line
@@ -537,11 +537,11 @@ debug-dll\libcurl.res \ 
debug-dll-ssl-dll\libcurl.res \

debug-dll-zlib-dll\libcurl.res \

debug-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc

	rc /dCURLDEBUG=1 /Fo $@ libcurl.rc

	rc /dDEBUGBUILD=1 /Fo $@ libcurl.rc



release-dll\libcurl.res \

release-dll-ssl-dll\libcurl.res \

release-dll-zlib-dll\libcurl.res \

release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc

	rc /dCURLDEBUG=0 /Fo $@ libcurl.rc

	rc /dDEBUGBUILD=0 /Fo $@ libcurl.rc

!ENDIF  # End of case where a config was provided.

src/Makefile.vc6

+2 −2
Original line number Diff line number Diff line
@@ -71,12 +71,12 @@ RTLIBD = /MTd 
## Release

CCR   = cl.exe $(RTLIB) /O2 /DNDEBUG

LINKR = link.exe /incremental:no /libpath:"../lib"

RCR   = rc.exe /dCURLDEBUG=0

RCR   = rc.exe /dDEBUGBUILD=0



## Debug

CCD   = cl.exe $(RTLIBD) /Gm /ZI /Od /D_DEBUG /GZ

LINKD = link.exe /incremental:yes /debug /libpath:"../lib"

RCD   = rc.exe /dCURLDEBUG=1

RCD   = rc.exe /dDEBUGBUILD=1



CFLAGS   = /I../lib /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c

LFLAGS   = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:$(MACHINE)