diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2002-07-13 06:20:52 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2002-07-13 06:20:52 +0000 |
| commit | e126ac5b0b0154afeb69e131a59ec7e17696df0e (patch) | |
| tree | 9b82565cfeb74c2d7bd4ab4b1b69b66910f3c871 /libhttpd.dsp | |
| parent | b930debaafe26a9c52f1cb363bb1684d220be303 (diff) | |
| download | httpd-e126ac5b0b0154afeb69e131a59ec7e17696df0e.tar.gz | |
Get rid of the buildmark bogosity. It never helped ide users, and
usually just hurt command line users.
If we have to link, we need a buildmark, so perform the buildmark
compilation as a 'manual' pre-link step every time a link is required.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96047 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'libhttpd.dsp')
| -rw-r--r-- | libhttpd.dsp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/libhttpd.dsp b/libhttpd.dsp index 8495b41572..f22c95b525 100644 --- a/libhttpd.dsp +++ b/libhttpd.dsp @@ -53,7 +53,13 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "$(INTDIR)\buildmark.obj" /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd +# Begin Special Build Tool +IntDir=.\Release +SOURCE="$(InputPath)" +PreLink_Desc=Compiling buildmark.c +PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"$(INTDIR)\buildmark.obj" +# End Special Build Tool !ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" @@ -79,7 +85,13 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "$(INTDIR)\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd +# Begin Special Build Tool +IntDir=.\Debug +SOURCE="$(InputPath)" +PreLink_Desc=Compiling buildmark.c +PreLink_Cmds=cl.exe /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c server\buildmark.c /Fo"$(INTDIR)\buildmark.obj" +# End Special Build Tool !ENDIF @@ -109,6 +121,7 @@ SOURCE=.\include\ap_release.h # Begin Source File SOURCE=.\server\buildmark.c +# PROP Exclude_From_Build 1 # End Source File # Begin Source File @@ -197,11 +210,11 @@ SOURCE=.\server\vhost.c # Begin Source File SOURCE=.\server\gen_test_char.exe -USERDEP__GEN_T=".\include\os.h" !IF "$(CFG)" == "libhttpd - Win32 Release" # PROP Ignore_Default_Tool 1 +USERDEP__GEN_T=".\include\os.h" # Begin Custom Build - Generating test_char.h from gen_test_char.exe InputPath=.\server\gen_test_char.exe @@ -213,6 +226,7 @@ InputPath=.\server\gen_test_char.exe !ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" # PROP Ignore_Default_Tool 1 +USERDEP__GEN_T=".\include\os.h" # Begin Custom Build - Generating test_char.h from gen_test_char.exe InputPath=.\server\gen_test_char.exe |