apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r419259 - in /apr/apr/branches/1.2.x: libapr.dsp test/Makefile.win test/testapp.dsp test/testappnt.dsp
Date Wed, 05 Jul 2006 15:41:33 GMT
Author: wrowe
Date: Wed Jul  5 08:41:33 2006
New Revision: 419259

URL: http://svn.apache.org/viewvc?rev=419259&view=rev
Log:
  Eliminate /machine:i386 to simplify our lives when invoking other
  linkers, normalize the remaining /EHsc references.

Backports: 397415

Modified:
    apr/apr/branches/1.2.x/libapr.dsp
    apr/apr/branches/1.2.x/test/Makefile.win
    apr/apr/branches/1.2.x/test/testapp.dsp
    apr/apr/branches/1.2.x/test/testappnt.dsp

Modified: apr/apr/branches/1.2.x/libapr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/libapr.dsp?rev=419259&r1=419258&r2=419259&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/libapr.dsp (original)
+++ apr/apr/branches/1.2.x/libapr.dsp Wed Jul  5 08:41:33 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 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
+# 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 /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 /out:"Release/libapr-1.dll"
/opt:ref
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
@@ -84,8 +84,8 @@
 # ADD BASE BSC32 /nologo
 # 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 /out:"Debug/libapr-1.dll"
+# 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
+# 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 /out:"Debug/libapr-1.dll"
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"

Modified: apr/apr/branches/1.2.x/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/Makefile.win?rev=419259&r1=419258&r2=419259&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/test/Makefile.win (original)
+++ apr/apr/branches/1.2.x/test/Makefile.win Wed Jul  5 08:41:33 2006
@@ -25,7 +25,7 @@
 
 CL = cl.exe
 
-CFLAGS = /nologo /c /MDd /W3 /Gm /GX /Zi /Od /D _DEBUG /D WIN32 /D APR_DECLARE_STATIC /FD

+CFLAGS = /nologo /c /MDd /W3 /Gm /EHsc /Zi /Od /D _DEBUG /D WIN32 /D APR_DECLARE_STATIC /FD

 
 .c.obj::
 	$(CL) -c $< $(CFLAGS) $(INCLUDES)
@@ -46,8 +46,8 @@
 
 # link programs using -no-install to get real executables not
 # libtool wrapper scripts which link an executable when first run.
-LINK_PROG = link.exe /nologo /debug /machine:I386 /subsystem:console /incremental:no 
-LINK_LIB = link.exe /nologo /dll /debug /machine:I386 /subsystem:windows /incremental:no
+LINK_PROG = link.exe /nologo /debug /subsystem:console /incremental:no 
+LINK_LIB = link.exe /nologo /dll /debug /subsystem:windows /incremental:no
 
 check: $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
 	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \

Modified: apr/apr/branches/1.2.x/test/testapp.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/testapp.dsp?rev=419259&r1=419258&r2=419259&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/test/testapp.dsp (original)
+++ apr/apr/branches/1.2.x/test/testapp.dsp Wed Jul  5 08:41:33 2006
@@ -49,8 +49,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/machine:I386
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
 
 !ELSEIF  "$(CFG)" == "testapp - Win32 Debug"
 
@@ -73,8 +73,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /debug /machine:I386
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /debug
 
 !ENDIF 
 

Modified: apr/apr/branches/1.2.x/test/testappnt.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/testappnt.dsp?rev=419259&r1=419258&r2=419259&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/test/testappnt.dsp (original)
+++ apr/apr/branches/1.2.x/test/testappnt.dsp Wed Jul  5 08:41:33 2006
@@ -49,8 +49,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /entry:"wmainCRTStartup"
/subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /entry:"wmainCRTStartup"
/subsystem:console
 
 !ELSEIF  "$(CFG)" == "testappnt - Win32 Debug"
 
@@ -73,8 +73,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /entry:"wmainCRTStartup"
/subsystem:console /incremental:no /debug /machine:I386
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /entry:"wmainCRTStartup"
/subsystem:console /incremental:no /debug
 
 !ENDIF 
 



Mime
View raw message