Lots of miscellaneous fixes merged from private branch

CMakeLists.txt

@@ -41,7 +41,7 @@ SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.markdown")
 SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 SET(CPACK_PACKAGE_VERSION_MAJOR "0")
 SET(CPACK_PACKAGE_VERSION_MINOR "5")
-SET(CPACK_PACKAGE_VERSION_PATCH "2")
+SET(CPACK_PACKAGE_VERSION_PATCH "3")
 SET(CPACK_PACKAGE_EXECUTABLES "xpwn" "XPwn Pwner")
 SET(CPACK_PACKAGE_EXECUTABLES "ipsw" "IPSW Tool")
 SET(CPACK_PACKAGE_EXECUTABLES "hdutil" "Apple disk image utility")

dfu-util/CMakeLists.txt

@@ -1,21 +1,23 @@
 INCLUDE(${PROJECT_SOURCE_DIR}/FindUSB.cmake)
 
-IF(NOT USB_FOUND)
-	message(STATUS "libusb is required for dfu-util!")
-ELSE(NOT USB_FOUND)
-	include_directories(${USB_INCLUDE_DIR})
-	link_directories(${USB_LIBRARIES})
+IF(NOT APPLE OR NOT BUILD_STATIC)
+	IF(NOT USB_FOUND)
+		message(STATUS "libusb is required for dfu-util!")
+		ELSE(NOT USB_FOUND)
+		include_directories(${USB_INCLUDE_DIR})
+		link_directories(${USB_LIBRARIES})
 
-	add_executable(dfu-util dfu.c sam7dfu.c main.c)
+		add_executable(dfu-util dfu.c sam7dfu.c main.c)
 
-	link_directories(${PROJECT_BINARY_DIR}/common ${PROJECT_BINARY_DIR}/hfs ${PROJECT_BINARY_DIR}/ipsw-patch)
+		link_directories(${PROJECT_BINARY_DIR}/common ${PROJECT_BINARY_DIR}/hfs ${PROJECT_BINARY_DIR}/ipsw-patch)
 
-	IF(APPLE)
-		SET_TARGET_PROPERTIES(dfu-util PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework IOKit")
-	ENDIF(APPLE)
+		IF(APPLE)
+			SET_TARGET_PROPERTIES(dfu-util PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework IOKit")
+		ENDIF(APPLE)
 
-	target_link_libraries(dfu-util xpwn)
-	target_link_libraries(dfu-util ${USB_LIBRARIES})
+		target_link_libraries(dfu-util xpwn)
+		target_link_libraries(dfu-util ${USB_LIBRARIES})
 
-	install(TARGETS dfu-util DESTINATION .)
-ENDIF(NOT USB_FOUND)
+		install(TARGETS dfu-util DESTINATION .)
+	ENDIF(NOT USB_FOUND)
+ENDIF(NOT APPLE OR NOT BUILD_STATIC)