apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apr aprlibdll.dsp
Date Tue, 28 Nov 2000 20:49:34 GMT
wrowe       00/11/28 12:49:33

  Modified:    .        aprlibdll.dsp
  Log:
    As noted by GStein, refering to an Apache file from within APR is evil...
    ergo we now define a specific base address for the aprlib.dll file, below
    the 0x6f000000 address range used by Apache itself.
  
  Revision  Changes    Path
  1.14      +4 -4      apr/aprlibdll.dsp
  
  Index: aprlibdll.dsp
  ===================================================================
  RCS file: /home/cvs/apr/aprlibdll.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- aprlibdll.dsp	2000/11/09 17:59:17	1.13
  +++ aprlibdll.dsp	2000/11/28 20:49:32	1.14
  @@ -53,8 +53,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows
/dll /map /machine:I386 /out:"Release/aprlib.dll" /libpath:"LibR" /base:@"..\..\os\win32\BaseAddr.ref",aprlib
  -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /subsystem:windows
/dll /map /machine:I386 /out:"Release/aprlib.dll" /base:@"..\..\os\win32\BaseAddr.ref",aprlib
  +# ADD BASE LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows
/dll /map /machine:I386 /out:"Release/aprlib.dll" /libpath:"LibR" /base:0x6EE0000
  +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /subsystem:windows
/dll /map /machine:I386 /out:"Release/aprlib.dll" /base:0x6EE0000
   
   !ELSEIF  "$(CFG)" == "aprlibdll - Win32 Debug"
   
  @@ -80,8 +80,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows
/dll /map /debug /machine:I386 /out:"Debug/aprlib.dll" /libpath:"LibD" /base:@"..\..\os\win32\BaseAddr.ref",aprlib
  -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /subsystem:windows
/dll /debug /machine:I386 /out:"Debug/aprlib.dll" /base:@"..\..\os\win32\BaseAddr.ref",aprlib
  +# ADD BASE LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows
/dll /map /debug /machine:I386 /out:"Debug/aprlib.dll" /libpath:"LibD" /base:0x6EE0000
  +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /subsystem:windows
/dll /debug /machine:I386 /out:"Debug/aprlib.dll" /base:0x6EE00000
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  
  
  

Mime
View raw message