aboutsummaryrefslogtreecommitdiff
path: root/src/or/Makefile.nmake
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-12-18 13:16:48 -0500
committerNick Mathewson <nickm@torproject.org>2013-01-16 22:29:38 -0500
commitb7dd71619519237af1383ee7185846fad3a5cdbe (patch)
tree2979eb791e974157d9d7fd8addfa0761d21db484 /src/or/Makefile.nmake
parent0102aaeb6b513fb40fef51103780fe121e13f549 (diff)
downloadtor-b7dd71619519237af1383ee7185846fad3a5cdbe.tar.gz
tor-b7dd71619519237af1383ee7185846fad3a5cdbe.zip
Add missing includes and libs to makefile.nmake
Fixes bugs 7312 and 7310.
Diffstat (limited to 'src/or/Makefile.nmake')
-rw-r--r--src/or/Makefile.nmake11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake
index 677618e74f..71d18c11b0 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 \