commit 60a2aa8b00a9f4711ce5ee3da9240422bf561123 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 17 14:38:52 2013 -0500

Add ntor-related modules to the Makefiles.nmake --- src/common/Makefile.nmake | 6 +++++- src/or/Makefile.nmake | 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake index 9672f4f..0ebeaaa 100644 --- a/src/common/Makefile.nmake +++ b/src/common/Makefile.nmake @@ -6,10 +6,14 @@ LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \ log.obj memarea.obj mempool.obj procmon.obj util.obj \ util_codedigest.obj

-LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj +LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj \ + crypto_curve25519.obj curve25519-donna.obj

LIBOR_EVENT_OBJECTS = compat_libevent.obj

+curve25519-donna.obj: ..\ext\curve25519_donna\curve25519-donna.c + $(CC) $(CFLAGS) /D inline=_inline /c ..\ext\curve25519_donna\curve25519-donna.c + libor.lib: $(LIBOR_OBJECTS) lib $(LIBOR_OBJECTS) /out:libor.lib

diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake index c334073..d67123a 100644 --- a/src/or/Makefile.nmake +++ b/src/or/Makefile.nmake @@ -44,6 +44,9 @@ LIBTOR_OBJECTS = \ nodelist.obj \ ntmain.obj \ onion.obj \ + onion_fast.obj \ + onion_ntor.obj \ + onion_tap.obj \ policies.obj \ reasons.obj \ relay.obj \