apr-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=419261&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/0.9.x/libapr.dsp
    apr/apr/branches/0.9.x/test/Makefile.win
    apr/apr/branches/0.9.x/test/testapp.dsp
    apr/apr/branches/0.9.x/test/testappnt.dsp

Modified: apr/apr/branches/0.9.x/libapr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/libapr.dsp?rev=419261&r1=419260&r2=419261&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/libapr.dsp (original)
+++ apr/apr/branches/0.9.x/libapr.dsp Wed Jul  5 08:43:19 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 /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 /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
+# 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
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"

Modified: apr/apr/branches/0.9.x/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/test/Makefile.win?rev=419261&r1=419260&r2=419261&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/test/Makefile.win (original)
+++ apr/apr/branches/0.9.x/test/Makefile.win Wed Jul  5 08:43:19 2006
@@ -39,7 +39,7 @@
 	-del $(CLEAN_TARGETS) $(PROGRAMS) *.obj *.pdb *.ilk 2>NUL
 
 .c.obj:
-	cl /nologo /c /MDd /W3 /GX /Zi /Od /DWIN32 /D_DEBUG /D_WINDOWS /DAPR_DECLARE_STATIC $(INCLUDES)
$<
+	cl /nologo /c /MDd /W3 /EHsc /Zi /Od /DWIN32 /D_DEBUG /D_WINDOWS /DAPR_DECLARE_STATIC $(INCLUDES)
$<
 
 testflock.exe: testflock.obj $(LOCAL_LIBS)
 	$(LINK) testflock.obj $(LOCAL_LIBS) $(ALL_LIBS)
@@ -51,7 +51,7 @@
 	$(LINK) readchild.obj $(LOCAL_LIBS) $(ALL_LIBS)
 
 proc_child.exe: proc_child.obj $(LOCAL_LIBS)
-	$(LINK) /debug /subsystem:console /machine:I386 \
+	$(LINK) /debug /subsystem:console \
 		proc_child.obj $(LOCAL_LIBS) $(ALL_LIBS)
 
 # FIXME: This is BS ... we should deal with namespace decoration within the
@@ -106,7 +106,7 @@
 	testenv.obj testprocmutex.obj
 
 testall.exe: $(TESTS) CuTest.obj $(LOCAL_LIBS)
-	$(LINK) /debug /subsystem:console /machine:I386 $(TESTS) CuTest.obj \
+	$(LINK) /debug /subsystem:console $(TESTS) CuTest.obj \
 		$(LOCAL_LIBS) $(ALL_LIBS)
 
 

Modified: apr/apr/branches/0.9.x/test/testapp.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/test/testapp.dsp?rev=419261&r1=419260&r2=419261&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/test/testapp.dsp (original)
+++ apr/apr/branches/0.9.x/test/testapp.dsp Wed Jul  5 08:43:19 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/0.9.x/test/testappnt.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/test/testappnt.dsp?rev=419261&r1=419260&r2=419261&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/test/testappnt.dsp (original)
+++ apr/apr/branches/0.9.x/test/testappnt.dsp Wed Jul  5 08:43:19 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