sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add missing includes and libs to makefile.nmake 

Fixes bugs 7312 and 7310.
This commit is contained in:
Nick Mathewson 2012-12-18 13:16:48 -05:00
parent 0102aaeb6b
commit b7dd716195
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/Makefile.nmake
View File

@ -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 \

11
src/or/Makefile.nmake
View File

@ -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 \

3
src/test/Makefile.nmake
View File

@ -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 \