nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

use the /Fe flag with msvc

Browse Source 
Fixes 7309
This commit is contained in:
Nick Mathewson 2012-12-18 13:41:11 -05:00
parent 9ddcd96149
commit ca3bc8973b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/Makefile.nmake
View File

@ -61,10 +61,10 @@ LIBTOR_OBJECTS = \
transports.obj transports.obj
libtor.lib: $(LIBTOR_OBJECTS) libtor.lib: $(LIBTOR_OBJECTS)
lib $(LIBTOR_OBJECTS) /out:libtor.lib lib $(LIBTOR_OBJECTS) /out:$@
tor.exe: libtor.lib tor_main.obj 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: clean:
del $(LIBTOR_OBJECTS) *.lib tor.exe del $(LIBTOR_OBJECTS) *.lib tor.exe

12
src/test/Makefile.nmake
View File

@ -12,16 +12,20 @@ LIBS = ..\..\..\build-alpha\lib\libevent.lib \
TEST_OBJECTS = test.obj test_addr.obj test_containers.obj \ TEST_OBJECTS = test.obj test_addr.obj test_containers.obj \
test_crypto.obj test_data.obj test_dir.obj test_microdesc.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) test.exe: $(TEST_OBJECTS)
$(CC) $(CFLAGS) $(LIBS) ..\common\*.lib $(TEST_OBJECTS) $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib $(TEST_OBJECTS) /Fe$@
bench.exe: bench.obj 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 test-child.exe: test-child.obj
$(CC) $(CFLAGS) test-child.obj $(CC) $(CFLAGS) test-child.obj /Fe$@
clean: clean:
del *.obj *.lib test.exe bench.exe test-child.exe del *.obj *.lib test.exe bench.exe test-child.exe