diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2000-11-28 20:49:32 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2000-11-28 20:49:32 +0000 |
| commit | 98b81f88180ac109110787c4adae0bf56344ad7d (patch) | |
| tree | 3ba6e412e90b55d11ee780719015d54a426b8cac /libapr.dsp | |
| parent | d78df857ff2bc503c74661d1419bec94aaadb190 (diff) | |
| download | libapr-98b81f88180ac109110787c4adae0bf56344ad7d.tar.gz | |
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.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60803 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'libapr.dsp')
| -rw-r--r-- | libapr.dsp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libapr.dsp b/libapr.dsp index 2a5f31450..efe63d476 100644 --- a/libapr.dsp +++ b/libapr.dsp @@ -53,8 +53,8 @@ BSC32=bscmake.exe # 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 @@ BSC32=bscmake.exe # 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 |