Merge commit 'aa8ef89434c016a1a04178c497723995bc6574a5'

Conflicts: cmake/FindWiiUse.cmake
2010-11-30 15:22:13 -06:00
parent 304bf4fc64 aa8ef89434
commit 03440c4b47
5 changed files with 404 additions and 196 deletions
--- a/cmake/FindWiiUse.cmake
+++ b/cmake/FindWiiUse.cmake
@@ -59,7 +59,15 @@ find_path(WIIUSE_INCLUDE_DIR

 set(_deps_check)
 if(WIN32)
-	find_file(WIIUSE_RUNTIME_LIBRARY NAMES wiiuse.dll HINTS "${_libdir}" "${_libdir}/../bin")
+	find_file(WIIUSE_RUNTIME_LIBRARY
+		NAMES
+		wiiuse.dll
+		HINTS
+		"${_libdir}"
+		"${_libdir}/.."
+		PATH_SUFFIXES
+		bin)
+
 	set(WIIUSE_RUNTIME_LIBRARIES "${WIIUSE_RUNTIME_LIBRARY}")
 	get_filename_component(WIIUSE_RUNTIME_LIBRARY_DIRS
 		"${WIIUSE_RUNTIME_LIBRARY}"