diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-18 13:41:11 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:29:39 -0500 |
| commit | ca3bc8973b406cb57bc64bc71bf1adfa27f3c5a9 (patch) | |
| tree | 0dbb46ebdb989730685a72797861adc9f558931c | |
| parent | 9ddcd961490dff3b47d2b863b25cd85e0a4d8fea (diff) | |
| download | tor-ca3bc8973b406cb57bc64bc71bf1adfa27f3c5a9.tar tor-ca3bc8973b406cb57bc64bc71bf1adfa27f3c5a9.tar.gz | |
use the /Fe flag with msvc
Fixes 7309
| -rw-r--r-- | src/or/Makefile.nmake | 4 | ||||
| -rw-r--r-- | src/test/Makefile.nmake | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake index 568c7455e..bf67769b5 100644 --- 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 1b0660cb3..6d6af96af 100644 --- 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 |