From 8391c96091e8e86c43954302df0b188ec1e5490d Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 9 Sep 2014 10:27:05 -0400
Subject: Clean up the MVSC nmake files so they work again.

Fixes bug 13081; bugfix on 0.2.5.1-alpha. Patch from "NewEraCracker."
---
 src/or/Makefile.nmake | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/or')

diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake
index 3b627b1d06..523bf3306b 100644
--- a/src/or/Makefile.nmake
+++ b/src/or/Makefile.nmake
@@ -1,6 +1,6 @@
 all: tor.exe
 
-CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
+CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
     /I ..\ext
 
 LIBS = ..\..\..\build-alpha\lib\libevent.lib \
@@ -15,6 +15,7 @@ LIBTOR_OBJECTS = \
   buffers.obj \
   channel.obj \
   channeltls.obj \
+  circpathbias.obj \
   circuitbuild.obj \
   circuitlist.obj \
   circuitmux.obj \
@@ -35,6 +36,7 @@ LIBTOR_OBJECTS = \
   dirvote.obj \
   dns.obj \
   dnsserv.obj \
+  ext_orport.obj \
   fp_pair.obj \
   entrynodes.obj \
   geoip.obj \
@@ -69,7 +71,7 @@ libtor.lib: $(LIBTOR_OBJECTS)
 	lib $(LIBTOR_OBJECTS) /out:$@
 
 tor.exe: libtor.lib tor_main.obj
-	$(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj /Fe$@
+	$(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib ..\ext\*.lib tor_main.obj /Fe$@
 
 clean:
-	del $(LIBTOR_OBJECTS) *.lib tor.exe
+	del $(LIBTOR_OBJECTS) tor_main.obj *.lib tor.exe
-- 
cgit v1.2.3-54-g00ecf