apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr-iconv apriconv.dsp libapriconv.dsp
Date Mon, 08 Sep 2003 14:59:18 GMT
wrowe       2003/09/08 07:59:18

  Modified:    .        apriconv.dsp libapriconv.dsp
  Log:
    Several users (especially those building jk/ant) had observed that
    the APR 0.9 files didn't match on Win32 - they were explicitly trying
    to locate and bind to libapr-0.dll (to match unix libapr-0.so.)  While
    binary compatibility prevented us from 'fixing' this discrepancy for
    our existing users - nothing prevents us from fixing this going forwards.
  
    This change allows us to locate APR 0.9 and 1.0 binaries and libraries
    in the same tree structure, as an added bonus.  It would also allow the
    APR library to be installed in a common location, such as \windows\system32,
    without introducing conflicts between 0.9 and 1.0.
  
  Revision  Changes    Path
  1.10      +2 -2      apr-iconv/apriconv.dsp
  
  Index: apriconv.dsp
  ===================================================================
  RCS file: /home/cvs/apr-iconv/apriconv.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apriconv.dsp	10 Mar 2003 18:43:57 -0000	1.9
  +++ apriconv.dsp	8 Sep 2003 14:59:18 -0000	1.10
  @@ -49,7 +49,7 @@
   # ADD BSC32 /nologo
   LIB32=link.exe -lib
   # ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo
  +# ADD LIB32 /nologo /out:"LibR\apriconv-1.lib"
   
   !ELSEIF  "$(CFG)" == "apriconv - Win32 Debug"
   
  @@ -73,7 +73,7 @@
   # ADD BSC32 /nologo
   LIB32=link.exe -lib
   # ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo
  +# ADD LIB32 /nologo /out:"LibD\apriconv-1.lib"
   
   !ENDIF 
   
  
  
  
  1.15      +2 -2      apr-iconv/libapriconv.dsp
  
  Index: libapriconv.dsp
  ===================================================================
  RCS file: /home/cvs/apr-iconv/libapriconv.dsp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- libapriconv.dsp	10 Mar 2003 18:56:20 -0000	1.14
  +++ libapriconv.dsp	8 Sep 2003 14:59:18 -0000	1.15
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows
/dll /incremental:no /debug /machine:I386 /opt:ref
  -# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/incremental:no /debug /machine:I386 /opt:ref
  +# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/incremental:no /debug /machine:I386 /out:"Release/libapriconv-1.dll" /opt:ref
   
   !ELSEIF  "$(CFG)" == "libapriconv - Win32 Debug"
   
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows
/dll /incremental:no /debug /machine:I386
  -# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/incremental:no /debug /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/incremental:no /debug /machine:I386 /out:"Debug/libapriconv-1.dll"
   
   !ENDIF 
   
  
  
  

Mime
View raw message