diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2006-07-05 15:43:19 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2006-07-05 15:43:19 +0000 |
| commit | b21dcb267ec416fda168190a29779779e3c5ef3e (patch) | |
| tree | 1e6275c6c8317602e5fddae2a5bb5832c39c1203 /test | |
| parent | 298e7054f66403c45863dff4131e7f6591ed739d (diff) | |
| download | libapr-b21dcb267ec416fda168190a29779779e3c5ef3e.tar.gz | |
Eliminate /machine:i386 to simplify our lives when invoking other
linkers, normalize the remaining /EHsc references.
Backports: 397415
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@419261 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.win | 6 | ||||
| -rw-r--r-- | test/testapp.dsp | 8 | ||||
| -rw-r--r-- | test/testappnt.dsp | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/test/Makefile.win b/test/Makefile.win index 5fc98afa8..bdedc4d4d 100644 --- a/test/Makefile.win +++ b/test/Makefile.win @@ -39,7 +39,7 @@ clean: -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 @@ readchild.exe: readchild.obj $(LOCAL_LIBS) $(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 @@ TESTS = testall.obj testtime.obj teststr.obj testvsn.obj testipsub.obj \ 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) diff --git a/test/testapp.dsp b/test/testapp.dsp index 5d40f89cc..93c4aa283 100644 --- a/test/testapp.dsp +++ b/test/testapp.dsp @@ -49,8 +49,8 @@ BSC32=bscmake.exe # 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 @@ BSC32=bscmake.exe # 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 diff --git a/test/testappnt.dsp b/test/testappnt.dsp index dfd0d0383..f5cd43397 100644 --- a/test/testappnt.dsp +++ b/test/testappnt.dsp @@ -49,8 +49,8 @@ BSC32=bscmake.exe # 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 @@ BSC32=bscmake.exe # 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 |