aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-01-17 14:38:52 -0500
committerNick Mathewson <nickm@torproject.org>2013-01-17 15:53:36 -0500
commit60a2aa8b00a9f4711ce5ee3da9240422bf561123 (patch)
tree81e520dab9235bfd2845d3b94671895559236e84 /src
parent1af89ce540d4cac253169423325bad73fa57f7fd (diff)
downloadtor-60a2aa8b00a9f4711ce5ee3da9240422bf561123.tar.gz
tor-60a2aa8b00a9f4711ce5ee3da9240422bf561123.zip
Add ntor-related modules to the Makefiles.nmake
Diffstat (limited to 'src')
-rw-r--r--src/common/Makefile.nmake6
-rw-r--r--src/or/Makefile.nmake3
2 files changed, 8 insertions, 1 deletions
diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake
index 9672f4fe9d..0ebeaaaf71 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 c33407373c..d67123a9a6 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 \