diff options
| author | Andrea Shepard <andrea@persephoneslair.org> | 2012-10-10 18:53:38 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@persephoneslair.org> | 2012-10-10 18:53:38 -0700 |
| commit | 8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9 (patch) | |
| tree | 92eabec1394092735e8b6e47f664f0094b76e6be /src/or/Makefile.nmake | |
| parent | ec97319464aab204740acb013b504abb0e13d989 (diff) | |
| parent | bd28322d3815a03ca04beb6d00052d613dbe226f (diff) | |
| download | tor-8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9.tar.gz tor-8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9.zip | |
Merge branch 'bug6816_squashed_nowarn' of git://git.torproject.org/nickm/tor
Diffstat (limited to 'src/or/Makefile.nmake')
| -rw-r--r-- | src/or/Makefile.nmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake index 3181e79c20..677618e74f 100644 --- a/src/or/Makefile.nmake +++ b/src/or/Makefile.nmake @@ -8,15 +8,15 @@ LIBS = ..\..\..\build-alpha\lib\libevent.a \ ..\..\..\build-alpha\lib\libz.a \ ws2_32.lib advapi32.lib shell32.lib -LIBTOR_OBJECTS = buffers.obj circuitbuild.obj circuitlist.obj circuituse.obj \ +LIBTOR_OBJECTS = buffers.obj channel.obj channeltls.obj circuitbuild.obj \ + circuitlist.obj circuitmux.obj circuitmux_ewma.obj circuituse.obj \ command.obj config.obj connection.obj connection_edge.obj \ connection_or.obj control.obj cpuworker.obj directory.obj \ - dirserv.obj dirvote.obj dns.obj dnsserv.obj geoip.obj \ - hibernate.obj main.obj microdesc.obj networkstatus.obj \ - nodelist.obj onion.obj policies.obj reasons.obj relay.obj \ - rendclient.obj rendcommon.obj rendmid.obj rendservice.obj \ - rephist.obj router.obj routerlist.obj routerparse.obj status.obj \ - config_codedigest.obj ntmain.obj + dirserv.obj dirvote.obj dns.obj dnsserv.obj geoip.obj hibernate.obj \ + main.obj microdesc.obj networkstatus.obj nodelist.obj onion.obj \ + policies.obj reasons.obj relay.obj rendclient.obj rendcommon.obj \ + rendmid.obj rendservice.obj rephist.obj router.obj routerlist.obj \ + routerparse.obj status.obj config_codedigest.obj ntmain.obj libtor.lib: $(LIBTOR_OBJECTS) lib $(LIBTOR_OBJECTS) /out:libtor.lib |