diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-18 13:16:48 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:29:38 -0500 |
| commit | b7dd71619519237af1383ee7185846fad3a5cdbe (patch) | |
| tree | 2979eb791e974157d9d7fd8addfa0761d21db484 | |
| parent | 0102aaeb6b513fb40fef51103780fe121e13f549 (diff) | |
| download | tor-b7dd71619519237af1383ee7185846fad3a5cdbe.tar tor-b7dd71619519237af1383ee7185846fad3a5cdbe.tar.gz | |
Add missing includes and libs to makefile.nmake
Fixes bugs 7312 and 7310.
| -rw-r--r-- | src/common/Makefile.nmake | 2 | ||||
| -rw-r--r-- | src/or/Makefile.nmake | 11 | ||||
| -rw-r--r-- | 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 e54827367..55923d2eb 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 677618e74..71d18c11b 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 aec477cf9..9580e39f4 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 \ |