use the /Fe flag with msvc

Fixes 7309

diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake
index 568c7455ebde7374f9470c94ae96e9d9f9cb54c6..bf67769b527ca5da168ba8a95195e8939053d643 100644 (file)
--- a/src/or/Makefile.nmake
+++ b/src/or/Makefile.nmake
@@ -61,10 +61,10 @@ LIBTOR_OBJECTS = \
   transports.obj
 
 libtor.lib: $(LIBTOR_OBJECTS)
-       lib $(LIBTOR_OBJECTS) /out:libtor.lib
+       lib $(LIBTOR_OBJECTS) /out:$@
 
 tor.exe: libtor.lib tor_main.obj
-       $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj
+       $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj /Fe$@
 
 clean:
        del $(LIBTOR_OBJECTS) *.lib tor.exe

diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake
index 1b0660cb3b9497a85940c9e4ada775d85ad8d57d..6d6af96af9a5049837e6b26e18746e13a202d6b3 100644 (file)
--- a/src/test/Makefile.nmake
+++ b/src/test/Makefile.nmake
@@ -12,16 +12,20 @@ LIBS = ..\..\..\build-alpha\lib\libevent.lib \
 
 TEST_OBJECTS = test.obj test_addr.obj test_containers.obj \
        test_crypto.obj test_data.obj test_dir.obj test_microdesc.obj \
-       test_pt.obj test_util.obj test_config.obj tinytest.obj
+       test_pt.obj test_util.obj test_config.obj test_cell_formats.obj \
+       test_replay.obj test_introduce.obj tinytest.obj
+
+tinytest.obj: ..\ext\tinytest.c
+       $(CC) $(CFLAGS) /D snprintf=_snprintf /c ..\ext\tinytest.c
 
 test.exe: $(TEST_OBJECTS)
-       $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib $(TEST_OBJECTS)
+       $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib $(TEST_OBJECTS) /Fe$@
 
 bench.exe: bench.obj
-       $(CC) $(CFLAGS) bench.obj $(LIBS) ..\common\*.lib
+       $(CC) $(CFLAGS) bench.obj $(LIBS) ..\common\*.lib /Fe$@
 
 test-child.exe: test-child.obj
-       $(CC) $(CFLAGS) test-child.obj
+       $(CC) $(CFLAGS) test-child.obj /Fe$@
 
 clean:
        del *.obj *.lib test.exe bench.exe test-child.exe