diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake
index 2c54023..aa02abd 100644
--- a/cmake/FindDirectX.cmake
+++ b/cmake/FindDirectX.cmake
@@ -3,6 +3,7 @@
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 	find_path (DirectX_ROOT_DIR
 		Include/d3d9.h
+		set(_PF86 "ProgramFiles(x86)")
 		PATHS
 			"$ENV{DXSDK_DIR}"
 			"$ENV{ProgramFiles}/Microsoft DirectX SDK (June 2010)"
@@ -14,15 +15,15 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 			"$ENV{ProgramFiles}/Microsoft DirectX SDK (November 2007)"
 			"$ENV{ProgramFiles}/Microsoft DirectX SDK (August 2007)"
 			"$ENV{ProgramFiles}/Microsoft DirectX SDK"
-			"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2010)"
-			"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (February 2010)"
-			"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2009)"
-			"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2008)"
-			"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2008)"
-			"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2008)"
-			"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (November 2007)"
-			"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2007)"
-			"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK"
+			"$ENV{${_PF86}}/Microsoft DirectX SDK (June 2010)"
+			"$ENV{${_PF86}}/Microsoft DirectX SDK (February 2010)"
+			"$ENV{${_PF86}}/Microsoft DirectX SDK (March 2009)"
+			"$ENV{${_PF86}}/Microsoft DirectX SDK (August 2008)"
+			"$ENV{${_PF86}}/Microsoft DirectX SDK (June 2008)"
+			"$ENV{${_PF86}}/Microsoft DirectX SDK (March 2008)"
+			"$ENV{${_PF86}}/Microsoft DirectX SDK (November 2007)"
+			"$ENV{${_PF86}}/Microsoft DirectX SDK (August 2007)"
+			"$ENV{${_PF86}}/Microsoft DirectX SDK"
 		DOC "DirectX SDK root directory")
 
 
diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
index d15f8a1..372b46a 100644
--- a/cmake/FindOpenSSL.cmake
+++ b/cmake/FindOpenSSL.cmake
@@ -17,24 +17,11 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
   set(OPENSSL_FOUND 0)
 
   if(WIN32)
+	set(TMP_OPENSSL_INCLUDE_DIR "./src/dep/include/openssl")
     if(PLATFORM MATCHES X64)
-      set(TMP_OPENSSL_INCLUDE_DIR
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/include/openssl"
-      )
-      set(TMP_OPENSSL_LIBRARIES
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/lib"
-      )
+      set(TMP_OPENSSL_LIBRARIES "./src/dep/lib/static/x64")
     else()
-      set(TMP_OPENSSL_INCLUDE_DIR
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
-      )
-      set(TMP_OPENSSL_LIBRARIES
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib"
-      )
+      set(TMP_OPENSSL_LIBRARIES "./src/dep/lib/static")
     endif()
   endif()
 
@@ -54,8 +41,7 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
 
   find_library(OPENSSL_LIBRARIES
     NAMES
-      ssleay32
-      ssl
+      libcrypto
     PATHS
       /usr/lib
       /usr/lib/ssl
@@ -70,6 +56,7 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
     find_library(OPENSSL_EXTRA_LIBRARIES
     NAMES
       libeay32
+	  libcrypto
     PATHS
       ${TMP_OPENSSL_LIBRARIES}
     DOC