summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-01-17 10:01:22 -0500
committerNick Mathewson <nickm@torproject.org>2013-01-17 10:01:22 -0500
commit2386a98d461bfbd8bbe0f5a17402841599c769e5 (patch)
tree2f9c1513b24f6047689e66a1f759a1f167ab3a6f
parent514d48459786eb5a88a657b23cbee3cc5b570ce4 (diff)
downloadtor-2386a98d461bfbd8bbe0f5a17402841599c769e5.tar.gz
tor-2386a98d461bfbd8bbe0f5a17402841599c769e5.zip
Add a missing part of bug 7311's makefile.nmake tweaks
Fix by "ultramage". This already has a changes entry.
-rw-r--r--src/or/Makefile.nmake3
-rw-r--r--src/test/Makefile.nmake3
-rw-r--r--src/tools/Makefile.nmake4
3 files changed, 6 insertions, 4 deletions
diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake
index bf67769b52..c33407373c 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 6d6af96af9..562c8df8b5 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 a30a28b2e1..fda1990e0b 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