aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-12-18 13:41:11 -0500
committerNick Mathewson <nickm@torproject.org>2013-01-16 22:29:39 -0500
commitca3bc8973b406cb57bc64bc71bf1adfa27f3c5a9 (patch)
tree0dbb46ebdb989730685a72797861adc9f558931c /src/test
parent9ddcd961490dff3b47d2b863b25cd85e0a4d8fea (diff)
downloadtor-ca3bc8973b406cb57bc64bc71bf1adfa27f3c5a9.tar
tor-ca3bc8973b406cb57bc64bc71bf1adfa27f3c5a9.tar.gz
use the /Fe flag with msvc
Fixes 7309
Diffstat (limited to 'src/test')
-rw-r--r--src/test/Makefile.nmake12
1 files changed, 8 insertions, 4 deletions
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