diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:32:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:32:12 -0500 |
| commit | b998431a33db2be0246f176ea0077b98d5258866 (patch) | |
| tree | d03935b5fbc9e8f6327af93b2897fc1f34d931fe /src/test | |
| parent | 8b62a738b3add64dcd26a82dff44a7e9e11ff5a9 (diff) | |
| parent | b7cf7bd9ae31aeddd03ad2094dd480d2b1d34d4f (diff) | |
| download | tor-b998431a33db2be0246f176ea0077b98d5258866.tar.gz tor-b998431a33db2be0246f176ea0077b98d5258866.zip | |
Merge branch '024_msvc_squashed'
Conflicts:
src/or/or.h
srcwin32/orconfig.h
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/Makefile.nmake | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake index aec477cf99..6d6af96af9 100644 --- a/src/test/Makefile.nmake +++ b/src/test/Makefile.nmake @@ -1,6 +1,7 @@ -all: test.exe +all: test.exe test-child.exe bench.exe -CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or +CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or \ + /I ..\ext LIBS = ..\..\..\build-alpha\lib\libevent.lib \ ..\..\..\build-alpha\lib\libcrypto.lib \ @@ -11,10 +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 /Fe$@ + +test-child.exe: test-child.obj + $(CC) $(CFLAGS) test-child.obj /Fe$@ clean: - del $(TEST_OBJECTS) *.lib test.exe + del *.obj *.lib test.exe bench.exe test-child.exe |