commit 2386a98d461bfbd8bbe0f5a17402841599c769e5 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 17 10:01:22 2013 -0500
Add a missing part of bug 7311's makefile.nmake tweaks
Fix by "ultramage".
This already has a changes entry. --- src/or/Makefile.nmake | 3 ++- src/test/Makefile.nmake | 3 ++- src/tools/Makefile.nmake | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake index bf67769..c334073 100644 --- a/src/or/Makefile.nmake +++ b/src/or/Makefile.nmake @@ -7,7 +7,8 @@ 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 + ws2_32.lib advapi32.lib shell32.lib \ + crypt32.lib gdi32.lib user32.lib
LIBTOR_OBJECTS = \ addressmap.obj \ diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake index 6d6af96..562c8df 100644 --- a/src/test/Makefile.nmake +++ b/src/test/Makefile.nmake @@ -8,7 +8,8 @@ LIBS = ......\build-alpha\lib\libevent.lib \ ......\build-alpha\lib\libssl.lib \ ......\build-alpha\lib\libz.lib \ ..\or\libtor.lib \ - ws2_32.lib advapi32.lib shell32.lib + ws2_32.lib advapi32.lib shell32.lib \ + crypt32.lib gdi32.lib user32.lib
TEST_OBJECTS = test.obj test_addr.obj test_containers.obj \ test_crypto.obj test_data.obj test_dir.obj test_microdesc.obj \ diff --git a/src/tools/Makefile.nmake b/src/tools/Makefile.nmake index a30a28b..fda1990 100644 --- a/src/tools/Makefile.nmake +++ b/src/tools/Makefile.nmake @@ -6,8 +6,8 @@ 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 - + ws2_32.lib advapi32.lib shell32.lib \ + crypt32.lib gdi32.lib user32.lib
tor-gencert.exe: tor-gencert.obj $(CC) $(CFLAGS) $(LIBS) ..\common*.lib tor-gencert.obj