Merge remote-tracking branch 'origin/master'

2012-11-24 22:36:36 +01:00
parent f64d1f187a c77996a8f2
commit cb03fca5f7
2 changed files with 4 additions and 2 deletions
@@ -391,7 +391,8 @@ win32 {
 		-lmswsock \
 		-lws2_32 \
 		-ladvapi32 \
-		-lwldap32
+		-lwldap32 \
+		-lcrypt32
 	RC_FILE = pokerth.rc
 }
 unix:!mac { 
@@ -157,7 +157,8 @@ win32 {
 			-lmswsock \
 			-lws2_32 \
 			-ladvapi32 \
-			-lwldap32
+			-lwldap32 \
+			-lcrypt32
 }

 !win32 {