[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apr-cvs
Subject:    svn commit: r397417 - in /apr/apr-util/trunk: libaprutil.dsp
From:       wrowe () apache ! org
Date:       2006-04-27 5:43:32
Message-ID: 20060427054333.64870.qmail () minotaur ! apache ! org
[Download RAW message or body]

Author: wrowe
Date: Wed Apr 26 22:43:32 2006
New Revision: 397417

URL: http://svn.apache.org/viewcvs?rev=397417&view=rev
Log:

  Eliminate /machine:i386 to simplify our lives when invoking other
  linkers, normalize the remaining /EHsc references.

Modified:
    apr/apr-util/trunk/libaprutil.dsp
    apr/apr-util/trunk/xml/expat/lib/expat.dsp

Modified: apr/apr-util/trunk/libaprutil.dsp
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/libaprutil.dsp?rev=397417&r1=397416&r2=397417&view=diff
 ==============================================================================
--- apr/apr-util/trunk/libaprutil.dsp (original)
+++ apr/apr-util/trunk/libaprutil.dsp Wed Apr 26 22:43:32 2006
@@ -52,8 +52,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib \
ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug \
                /machine:I386 /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib \
/nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug \
/machine:I386 /out:"Release/libaprutil-1.dll" /opt:ref +# ADD BASE LINK32 \
kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo \
/base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref +# ADD \
LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo \
/base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug \
/out:"Release/libaprutil-1.dll" /opt:ref  
 !ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
 
@@ -78,8 +78,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib \
ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug \
                /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib \
/nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug \
/machine:I386 /out:"Debug/libaprutil-1.dll" +# ADD BASE LINK32 kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" \
/subsystem:windows /dll /incremental:no /debug +# ADD LINK32 kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" \
/subsystem:windows /dll /incremental:no /debug /out:"Debug/libaprutil-1.dll"  
 !ENDIF 
 

Modified: apr/apr-util/trunk/xml/expat/lib/expat.dsp
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/xml/expat/lib/expat.dsp?rev=397417&r1=397416&r2=397417&view=diff
 ==============================================================================
--- apr/apr-util/trunk/xml/expat/lib/expat.dsp (original)
+++ apr/apr-util/trunk/xml/expat/lib/expat.dsp Wed Apr 26 22:43:32 2006
@@ -51,8 +51,8 @@
 # ADD BASE BSC32 /nologo
 # 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 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 +# 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  
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
@@ -77,8 +77,8 @@
 # ADD BASE BSC32 /nologo
 # 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 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 /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 /pdbtype:sept  
 !ENDIF 
 
@@ -99,7 +99,7 @@
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
-# ADD CPP /GX- /Od /D VERSION=\"expat_1.95.2\"
+# ADD CPP /EHsc- /Od /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 


[prev in list] [next in list] [prev in thread] [next in thread]