httpd-test-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@apache.org>
Subject Re: Finally able to make the flood (1.1) executable for Win32 (part 2)
Date Thu, 09 Oct 2003 19:55:05 GMT
Norman, we need the unified, diff -u3 results, as the regular diffs don't 
provide enough context.  I'll review and commit in the morning if you
would please repost.

If your mailer wraps or distorts text, do not send inline, but please attach
instead.

Bill

At 02:23 PM 10/9/2003, Norman Tuttle wrote:
>email sent by Norman Tuttle, OpenDemand Systems Developer
>(ntuttle@opendemand.com)-
>
>Here are the diffs for flood.dsp needed in order to successfully build
>Flood on Win32 using a Microsoft VC++ 6.0 Enterprise Compiler (MSDEV) - the
>last email explains how I generated the diffs from our own CVS repository 
>(I did not do a diff for XLATE.C, which I explained was a problem in
>Windows which needs to get iconv from the APR, since the fix I have
>likely masks the real issue which is the missing definition of the
>apr_iconv_t structure which appears within the conditional code in
>XLATE.C); they go with change to Makefile.win outlined in part 1 of email:
>
>diff -r1.1.1.1 flood.dsp
>10c10
>< !MESSAGE 
>---
>> !MESSAGE
>12c12
>< !MESSAGE 
>---
>> !MESSAGE
>15c15
>< !MESSAGE 
>---
>> !MESSAGE
>17c17
>< !MESSAGE 
>---
>> !MESSAGE
>19c19
>< !MESSAGE 
>---
>> !MESSAGE
>22c22
>< !MESSAGE 
>---
>> !MESSAGE
>45c45
>< # ADD CPP /nologo /MD /W3 /O2 /I "$(APRPATH)\include" /I
>"$(APRUTILPATH)\include" /I "$(OPENSSLPATH)\inc32" /D "NDEBUG" /D "WIN32"
>/D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
>"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2"
>/Fd"Release/flood" /FD /c
>---
>> # ADD CPP /nologo /MD /W3 /O2 /I "$(APRPATH)\include" /I
>"$(APRUTILPATH)\include" /I "$(SRCLIB)\apr-iconv\include" /D "NDEBUG" /D
>"WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
>"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2"
>/Fd"Release/flood" /FD /c
>53c53,54
>< # ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib apr.lib
>aprutil.lib pcreposix.lib libeay32.lib ssleay32.lib /nologo
>/subsystem:console /map /machine:I386 /libpath:"$(APRPATH)\LibR"
>/libpath:"$(APRUTILPATH)\LibR" /libpath:"$(OPENSSLPATH)\$(SSLBIN)"
>/libpath:"$(REGEXPATH)\LibR"
>---
>> # ADD LINK32 msvcrt.lib oldnames.lib kernel32.lib advapi32.lib
>wsock32.lib ws2_32.lib apr.lib aprutil.lib apriconv.lib xml.lib
>pcreposix.lib pcre.lib libeay32.lib ssleay32.lib /nologo
>/subsystem:console /map /machine:I386 /nodefaultlib
>/libpath:"$(APRPATH)\LibR" /libpath:"$(APRUTILPATH)\LibR"
>/libpath:"$(REGEXPATH)\LibR"
>> # SUBTRACT LINK32 /pdb:none
>69c70
>< # ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "$(APRPATH)\include" /I
>"$(APRUTILPATH)\include" /I "$(OPENSSLPATH)\inc32" /D "_DEBUG" /D "WIN32"
>/D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
>"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2"
>/Fd"Debug/flood" /FD /c
>---
>> # ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I
>"C:\Work\openload\c\src\httpd-test\flood\apr-iconv\include" /I
>"C:\Work\openload\c\src\httpd-test\flood\apr\include" /I
>"c:\Work\openload\c\src\httpd-test\flood\apr-util\include" /D "_DEBUG" /D
>"WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
>"WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2"
>/Fd"Debug/flood" /FD /c
>77c78,79
>< # ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib apr.lib
>aprutil.lib pcreposix.lib libeay32.lib ssleay32.lib /nologo
>/subsystem:console /incremental:no /map /debug /machine:I386
>/libpath:"$(APRPATH)\LibD" /libpath:"$(APRUTILPATH)\LibD"
>/libpath:"$(OPENSSLPATH)\$(SSLBIN)" /libpath:"$(REGEXPATH)\LibD"
>---
>> # ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib apr.lib
>apriconv.lib xml.lib pcreposix.lib pcre.lib libeay32.lib ssleay32.lib
>aprutil.lib /nologo /subsystem:console /incremental:no /map /debug
>/machine:I386 /libpath:"c:\Work\openload\c\httpd-test\flood"
>> # SUBTRACT LINK32 /pdb:none
>79c81
>< !ENDIF 
>---
>> !ENDIF


Mime
View raw message