[tor-commits] [tor/master] Add missing includes and libs to makefile.nmake

[nickm at torproject.org]

commit b7dd71619519237af1383ee7185846fad3a5cdbe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 13:16:48 2012 -0500

    Add missing includes and libs to makefile.nmake
    
    Fixes bugs 7312 and 7310.
---
 src/common/Makefile.nmake |    2 +-
 src/or/Makefile.nmake     |   11 ++++++-----
 src/test/Makefile.nmake   |    3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake
index e548273..55923d2 100644
--- a/src/common/Makefile.nmake
+++ b/src/common/Makefile.nmake
@@ -1,6 +1,6 @@
 all: libor.lib libor-crypto.lib libor-event.lib
 
-CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include
+CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\ext
 
 LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \
 	log.obj memarea.obj mempool.obj procmon.obj util.obj \
diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake
index 677618e..71d18c1 100644
--- a/src/or/Makefile.nmake
+++ b/src/or/Makefile.nmake
@@ -1,11 +1,12 @@
 all: tor.exe
 
-CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common
+CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
+    /I ..\ext
 
-LIBS = ..\..\..\build-alpha\lib\libevent.a \
- ..\..\..\build-alpha\lib\libcrypto.a \
- ..\..\..\build-alpha\lib\libssl.a \
- ..\..\..\build-alpha\lib\libz.a \
+LIBS = ..\..\..\build-alpha\lib\libevent.lib \
+ ..\..\..\build-alpha\lib\libcrypto.lib \
+ ..\..\..\build-alpha\lib\libssl.lib \
+ ..\..\..\build-alpha\lib\libz.lib \
  ws2_32.lib advapi32.lib shell32.lib
 
 LIBTOR_OBJECTS = buffers.obj channel.obj channeltls.obj circuitbuild.obj \
diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake
index aec477c..9580e39 100644
--- a/src/test/Makefile.nmake
+++ b/src/test/Makefile.nmake
@@ -1,6 +1,7 @@
 all: test.exe
 
-CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or
+CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or \
+    /I ..\ext
 
 LIBS = ..\..\..\build-alpha\lib\libevent.lib \
  ..\..\..\build-alpha\lib\libcrypto.lib \