diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2000-10-03 08:55:06 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2000-10-03 08:55:06 +0200 |
| commit | 86878efb04809ac2791cfdd0920d29786ccba700 (patch) | |
| tree | 7e54b59c657032eb6b50f11698bc414cf6efff0a /srclib/expat-lite | |
| parent | Ok... I've been waiting to find out what happens when we commit to two (diff) | |
| download | apache2-86878efb04809ac2791cfdd0920d29786ccba700.tar.xz apache2-86878efb04809ac2791cfdd0920d29786ccba700.zip | |
Fix a few colliding modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86374 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'srclib/expat-lite')
| -rw-r--r-- | srclib/expat-lite/xmlparse.dsp | 7 | ||||
| -rw-r--r-- | srclib/expat-lite/xmltok.dsp | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/srclib/expat-lite/xmlparse.dsp b/srclib/expat-lite/xmlparse.dsp index 454df6d164..7657e25aef 100644 --- a/srclib/expat-lite/xmlparse.dsp +++ b/srclib/expat-lite/xmlparse.dsp @@ -53,7 +53,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\xmlparse.def" /base:@"..\..\os\win32\BaseAddr.ref",xmlparse +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "xmlparse - Win32 Debug" @@ -79,7 +80,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\xmlparse.def" /pdbtype:sept /base:@"..\..\os\win32\BaseAddr.ref",xmlparse +# SUBTRACT LINK32 /pdb:none !ENDIF @@ -98,6 +100,7 @@ SOURCE="..\..\lib\expat-lite\xmlparse.c" # Begin Source File SOURCE="..\..\lib\expat-lite\xmlparse.def" +# PROP Exclude_From_Build 1 # End Source File # Begin Source File diff --git a/srclib/expat-lite/xmltok.dsp b/srclib/expat-lite/xmltok.dsp index ad9c0f42b9..95d46d8f1d 100644 --- a/srclib/expat-lite/xmltok.dsp +++ b/srclib/expat-lite/xmltok.dsp @@ -53,7 +53,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\xmltok.def" /base:@"..\..\os\win32\BaseAddr.ref",xmltok +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "xmltok - Win32 Debug" @@ -80,7 +81,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\xmltok.def" /pdbtype:sept /base:@"..\..\os\win32\BaseAddr.ref",xmltok +# SUBTRACT LINK32 /pdb:none !ENDIF @@ -103,6 +105,7 @@ SOURCE="..\..\lib\expat-lite\xmltok.c" # Begin Source File SOURCE="..\..\lib\expat-lite\xmltok.def" +# PROP Exclude_From_Build 1 # End Source File # End Target # End Project |