Add missing includes and libs to makefile.nmake

Fixes bugs 7312 and 7310.

diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake
index e54827367053940dc7771d97e2c0eb32a46c556e..55923d2ebb2ce5c4bd8b71989174f175660802a3 100644 (file)
--- 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 677618e74ffa23422dcefc2d45e993c8e3321751..71d18c11b0f27a130e7644c0dadc03ac0f6db385 100644 (file)
--- 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 aec477cf99073590b1eafc7a33a1025ed7df8d14..9580e39f4d93c471c64ea659ffc0d6b21f10ee50 100644 (file)
--- 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 \