diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2003-09-08 14:49:13 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2003-09-08 14:49:13 +0000 |
| commit | fba13c1ab53280341e53efc92058c40f6e76e1fb (patch) | |
| tree | d70e871bc1a0a4046bb03e33281b357d289b59e8 /libapr.dsp | |
| parent | 8dbd6fdf9629ce8e28ea100bbdd929ce56402ea2 (diff) | |
| download | libapr-fba13c1ab53280341e53efc92058c40f6e76e1fb.tar.gz | |
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.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64612 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'libapr.dsp')
| -rw-r--r-- | libapr.dsp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libapr.dsp b/libapr.dsp index 070f5ed5f..8f278c9ac 100644 --- a/libapr.dsp +++ b/libapr.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /opt:ref -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /opt:ref +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/libapr-1.dll" /opt:ref !ELSEIF "$(CFG)" == "libapr - Win32 Debug" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386 -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386 +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/libapr-1.dll" !ENDIF |