From df988075c73616c007e3e02e8cca9e9bbc681985 Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au>
Date: Thu, 19 Feb 2015 19:01:13 +1100
Subject: Fix case sensitive FS issue and update Linux README

---
 Linux/README           | 52 ++++++++------------------------------------------
 cmake/FindLibusb.cmake | 36 ----------------------------------
 cmake/Findlibusb.cmake | 36 ++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 80 deletions(-)
 delete mode 100644 cmake/FindLibusb.cmake
 create mode 100644 cmake/Findlibusb.cmake

diff --git a/Linux/README b/Linux/README
index 3c41efa..46bda39 100644
--- a/Linux/README
+++ b/Linux/README
@@ -472,57 +472,21 @@ be included.
 
 
 
-Appendix B - Installing Heimdall from Source:
+Appendix B - Installing Heimdall Suite from Source:
 
-    1. First make sure you have installed build-tools, pkgconfig, zlib-dev and
-       libusbx.
+    1. First make sure you have installed build-essential, cmake, zlib1g-dev,
+       qt5-default, libusb-1.0-0-dev and OpenGL (e.g libgl1-mesa-glx and
+       libgl1-mesa-dev).
 
        NOTE: Package names may not be absolutely identical to those above.
 
     2. Open a terminal and navigate to the directory you downloaded,
        or extracted, Heimdall to.
 
-    3. Enter the following commands to compile libpit:
+    3. Enter the following commands to compile Heimdall Suite:
 
-            cd libpit
-            ./configure
+            mkdir build
+            cd build
+            cmake -DCMAKE_BUILD_TYPE=Release ..
             make
-            cd ..
-
-       NOTE: There is no need to run "sudo make install".
-
-    4. Enter the following commands to compile and install Heimdall:
-
-            cd heimdall
-            ./configure
-            make
-            sudo make install
-            cd ..
-
-    5. Done
-
-
-
-Appendix C - Installing Heimdall Frontend from Source:
-
-    1. Compile and install Heimdall, see Appendix B.
-
-    2. First make sure you have installed Qt (4.7 or later, but prior to 5.0).
-       You can typically install Qt through your platforms package manager, or
-       alternatively download it from:
-
-          http://qt-project.org/downloads
-
-    3. Open a terminal and navigate to the directory you extracted Heimdall to.
-
-    4. Enter the following commands to compile and install Heimdall Frontend:
-
-            cd heimdall-frontend
-            qmake-qt4
-            make
-            sudo make install
-            
-       NOTE: If qmake-qt4 does not exist on your platform, try qmake instead.
-
-    5. Done
 
diff --git a/cmake/FindLibusb.cmake b/cmake/FindLibusb.cmake
deleted file mode 100644
index 4b099d3..0000000
--- a/cmake/FindLibusb.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-find_path(LIBUSB_INCLUDE_DIR
-    NAMES
-        libusb.h
-    PATHS
-        /usr/local/include
-        /opt/local/include
-        /usr/include
-    PATH_SUFFIXES
-        libusb-1.0
-)
-
-if (libusb_USE_STATIC_LIBS AND NOT MSVC)
-    set (LIBUSB_LIB_PREFIX "lib" CACHE INTERNAL "libusb library name prefox passed to find_library")
-    set (LIBUSB_LIB_SUFFIX ".a" CACHE INTERNAL "libusb library name suffix passed to find_library")
-else (libusb_USE_STATIC_LIBS AND NOT MSVC)
-    set (LIBUSB_LIB_PREFIX "" CACHE INTERNAL "libusb library name prefox passed to find_library")
-    set (LIBUSB_LIB_SUFFIX "" CACHE INTERNAL "libusb library name suffix passed to find_library")
-endif (libusb_USE_STATIC_LIBS AND NOT MSVC)
-
-find_library(LIBUSB_LIBRARY
-    NAMES
-        ${LIBUSB_LIB_PREFIX}usb-1.0${LIBUSB_LIB_SUFFIX} ${LIBUSB_LIB_PREFIX}usb${LIBUSB_LIB_SUFFIX}
-    PATHS
-        /usr/local/lib
-        /opt/local/lib
-        /usr/lib
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LIBUSB REQUIRED_VARS LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR)
-
-if (LIBUSB_FOUND)
-    set(LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR})
-    set(LIBUSB_LIBRARIES ${LIBUSB_LIBRARY})
-    mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARY)
-endif (LIBUSB_FOUND)
diff --git a/cmake/Findlibusb.cmake b/cmake/Findlibusb.cmake
new file mode 100644
index 0000000..4b099d3
--- /dev/null
+++ b/cmake/Findlibusb.cmake
@@ -0,0 +1,36 @@
+find_path(LIBUSB_INCLUDE_DIR
+    NAMES
+        libusb.h
+    PATHS
+        /usr/local/include
+        /opt/local/include
+        /usr/include
+    PATH_SUFFIXES
+        libusb-1.0
+)
+
+if (libusb_USE_STATIC_LIBS AND NOT MSVC)
+    set (LIBUSB_LIB_PREFIX "lib" CACHE INTERNAL "libusb library name prefox passed to find_library")
+    set (LIBUSB_LIB_SUFFIX ".a" CACHE INTERNAL "libusb library name suffix passed to find_library")
+else (libusb_USE_STATIC_LIBS AND NOT MSVC)
+    set (LIBUSB_LIB_PREFIX "" CACHE INTERNAL "libusb library name prefox passed to find_library")
+    set (LIBUSB_LIB_SUFFIX "" CACHE INTERNAL "libusb library name suffix passed to find_library")
+endif (libusb_USE_STATIC_LIBS AND NOT MSVC)
+
+find_library(LIBUSB_LIBRARY
+    NAMES
+        ${LIBUSB_LIB_PREFIX}usb-1.0${LIBUSB_LIB_SUFFIX} ${LIBUSB_LIB_PREFIX}usb${LIBUSB_LIB_SUFFIX}
+    PATHS
+        /usr/local/lib
+        /opt/local/lib
+        /usr/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LIBUSB REQUIRED_VARS LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR)
+
+if (LIBUSB_FOUND)
+    set(LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR})
+    set(LIBUSB_LIBRARIES ${LIBUSB_LIBRARY})
+    mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARY)
+endif (LIBUSB_FOUND)
-- 
cgit v1.2.3