From cdd53cdb9b12fdcf2dbee5490f1ab82866a7b385 Mon Sep 17 00:00:00 2001 From: Marc Laporte Date: Mon, 13 Jan 2014 17:48:25 -0500 Subject: Fix typos --- Win32/README.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Win32') diff --git a/Win32/README.txt b/Win32/README.txt index 2214497..6a782a7 100644 --- a/Win32/README.txt +++ b/Win32/README.txt @@ -12,7 +12,7 @@ DISCLAIMER: These instructions were written for Windows 7 / Vista / Server 2008 however the -producedure should be essentially the same for all supported versions of +procedure should be essentially the same for all supported versions of Windows (XP onwards). @@ -198,7 +198,7 @@ Performing a Custom Flash with Heimdall Frontend: clicking the "Remove" button. Removing a partition from the list doesn't remove it from your device, it simply means it will not be flashed. - 10. Repeat steps 7-9 as often as needed to specify all the partions/files + 10. Repeat steps 7-9 as often as needed to specify all the partitions/files that you wish to flash. 11. Now you can chose whether you would like to repartition your device as -- cgit v1.1 From 9f957a193701788cac66292daea2c89ed94a033f Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Tue, 6 May 2014 22:52:10 +1000 Subject: Updated copyright notices to 2014 --- Win32/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Win32') diff --git a/Win32/README.txt b/Win32/README.txt index 6a782a7..5f1fc6e 100644 --- a/Win32/README.txt +++ b/Win32/README.txt @@ -1,4 +1,4 @@ -Heimdall (c) 2010-2013 Benjamin Dobell, Glass Echidna +Heimdall (c) 2010-2014 Benjamin Dobell, Glass Echidna http://www.glassechidna.com.au/products/heimdall/ DISCLAIMER: -- cgit v1.1 From bd9b2bdee6f65ca2a7531fe81e7a80261a87dc5d Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Sat, 17 May 2014 04:43:34 +1000 Subject: Removed VC++ info from Windows README as builds are now statically linked. --- Win32/README.txt | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'Win32') diff --git a/Win32/README.txt b/Win32/README.txt index 5f1fc6e..aec4b35 100644 --- a/Win32/README.txt +++ b/Win32/README.txt @@ -16,21 +16,6 @@ procedure should be essentially the same for all supported versions of Windows (XP onwards). -Troubleshooting: - - 1. If when you try launch Heimdall or Heimdall Frontend you receive a - similar to: - - The program can't start because MSVCP110.dll is missing from your - computer. - - This means that you haven't installed the Microsoft Visual C++ 2012 - runtimes. The runtimes can be downloaded from Microsoft's website: - - http://www.microsoft.com/en-au/download/details.aspx?id=30679 - - - Driver Installation Instructions: 1. Put your device into download mode and plug it in. -- cgit v1.1 From 09ba1839225ea6adcba65ebec2f3a783edd6647d Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Tue, 17 Feb 2015 01:23:22 +1100 Subject: Update Heimdall CLI build to use an MSYS2 environment --- Win32/README.txt | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'Win32') diff --git a/Win32/README.txt b/Win32/README.txt index aec4b35..d707353 100644 --- a/Win32/README.txt +++ b/Win32/README.txt @@ -517,31 +517,32 @@ be included. Appendix B - Installing Heimdall Suite from Source - 1. Ensure that you have both a version of Visual Studio 2012 with C++ - support and Qt Developer Framework (4.7 or later, but prior to 5.0) - installed on your system. + Heimdall and Heimdall Frontend both utilise the CMake for managing the build + process. CMake can generate files for various build systems including GNU + Make and Visual Studio. However, official packages are compiled with GNU + Make and MinGW-W64 Clang. - A free version (Visual C++ 2012 Express) can be downloaded from - Microsoft's website: + NOTE: Official builds use MinGW-W64 simply because on-going cross-platform + development is simpler when using just the one IDE (Jetbrain's CLion) + and compiler (Clang) on all platforms. - http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-products + 1. Setup a MinGW-W64 build environment by utilising MSYS2: - Qt can also be downloaded freely from: + http://msys2.github.io/ - http://qt-project.org/downloads + 2. After installing MSYS2 a command prompt will launch, enter: - 2. Open msvc2012.sln + Pacman -Syu + Pacman -S mingw-w64-x86_64 mingw-w64-x86_64-clang mingw-w64-x86_64-cmake mingw-w64-x86_64-make - 3. From the Solutions Configuration drop-down change from "Debug" to - "Release". + 3. Add the MinGW-W64 binaries to your PATH environment variable: - 4. In the Solution Explorer right-click on the heimdall-frontend project - and chose "Build". + export PATH="/mingw64/bin:$PATH" - 5. Depending on how you've installed Qt on your system you may need to copy - "QtCore4.dll, "QtGui4.dll" and "QtXml4.dll" from your Qt bin/ - sub-directory to Heimdall's Win32/Release sub-directory. - - 6. Heimdall Frontend can then be run from Win32/Release or command line can - be used to run Heimdall (command line) from the same directory. + 4. Build Heimdall & Heimdall Frontend + mkdir build + cd build + export cxx=clang++ + cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release .. + make -- cgit v1.1 From 39b48f2357b0b783815be88031b738376fa228e0 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Thu, 19 Feb 2015 02:51:00 +1100 Subject: Upgrade Heimdall Frontend to Qt5 and build with cmake --- Win32/README.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Win32') diff --git a/Win32/README.txt b/Win32/README.txt index d707353..892f639 100644 --- a/Win32/README.txt +++ b/Win32/README.txt @@ -520,11 +520,11 @@ Appendix B - Installing Heimdall Suite from Source Heimdall and Heimdall Frontend both utilise the CMake for managing the build process. CMake can generate files for various build systems including GNU Make and Visual Studio. However, official packages are compiled with GNU - Make and MinGW-W64 Clang. + Make and MinGW-W64 GCC/G++. NOTE: Official builds use MinGW-W64 simply because on-going cross-platform development is simpler when using just the one IDE (Jetbrain's CLion) - and compiler (Clang) on all platforms. + and similar toolchains. 1. Setup a MinGW-W64 build environment by utilising MSYS2: @@ -533,7 +533,7 @@ Appendix B - Installing Heimdall Suite from Source 2. After installing MSYS2 a command prompt will launch, enter: Pacman -Syu - Pacman -S mingw-w64-x86_64 mingw-w64-x86_64-clang mingw-w64-x86_64-cmake mingw-w64-x86_64-make + Pacman -S mingw-w64-x86_64 mingw-w64-x86_64-clang mingw-w64-x86_64-cmake mingw-w64-x86_64-make mingw-w64-x86_64-qt5-static 3. Add the MinGW-W64 binaries to your PATH environment variable: @@ -543,6 +543,5 @@ Appendix B - Installing Heimdall Suite from Source mkdir build cd build - export cxx=clang++ - cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release .. + cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DQt5Widgets_DIR=/c/msys64/mingw64/qt5-static/lib/cmake/Qt5Widgets .. make -- cgit v1.1 From b75bdcbc5225d6bd83740e2a1075a8aeb2052627 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Sat, 21 Feb 2015 05:31:14 +1100 Subject: Added missing info to the Windows README --- Win32/README.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Win32') diff --git a/Win32/README.txt b/Win32/README.txt index 892f639..362d06e 100644 --- a/Win32/README.txt +++ b/Win32/README.txt @@ -517,7 +517,7 @@ be included. Appendix B - Installing Heimdall Suite from Source - Heimdall and Heimdall Frontend both utilise the CMake for managing the build + Heimdall and Heimdall Frontend both utilise CMake for managing the build process. CMake can generate files for various build systems including GNU Make and Visual Studio. However, official packages are compiled with GNU Make and MinGW-W64 GCC/G++. @@ -533,7 +533,7 @@ Appendix B - Installing Heimdall Suite from Source 2. After installing MSYS2 a command prompt will launch, enter: Pacman -Syu - Pacman -S mingw-w64-x86_64 mingw-w64-x86_64-clang mingw-w64-x86_64-cmake mingw-w64-x86_64-make mingw-w64-x86_64-qt5-static + Pacman -S mingw-w64-x86_64 mingw-w64-x86_64-clang mingw-w64-x86_64-cmake mingw-w64-x86_64-libusb mingw-w64-x86_64-qt5-static make 3. Add the MinGW-W64 binaries to your PATH environment variable: -- cgit v1.1