diff options
| author | Benjamin Dobell <benjamin.dobell+github@glassechidna.com.au> | 2010-12-04 03:51:05 +0100 |
|---|---|---|
| committer | Benjamin Dobell <benjamin.dobell+github@glassechidna.com.au> | 2010-12-04 03:51:05 +0100 |
| commit | 2949aca6a9fc8c4186376128f757227f40e3a515 (patch) | |
| tree | 83560698523705e3a2ed7b89419b9c52bc7841fa | |
| parent | Took out extraneous ']' from usage message. (diff) | |
| download | Heimdall-2949aca6a9fc8c4186376128f757227f40e3a515.tar Heimdall-2949aca6a9fc8c4186376128f757227f40e3a515.tar.gz Heimdall-2949aca6a9fc8c4186376128f757227f40e3a515.tar.bz2 Heimdall-2949aca6a9fc8c4186376128f757227f40e3a515.tar.lz Heimdall-2949aca6a9fc8c4186376128f757227f40e3a515.tar.xz Heimdall-2949aca6a9fc8c4186376128f757227f40e3a515.tar.zst Heimdall-2949aca6a9fc8c4186376128f757227f40e3a515.zip | |
Diffstat (limited to '')
| -rw-r--r-- | Heimdall/Linux/README | 3 | ||||
| -rw-r--r-- | Heimdall/OSX/README.txt | 15 | ||||
| -rw-r--r-- | Heimdall/heimdall-frontend/heimdall-frontend.pro | 25 |
3 files changed, 34 insertions, 9 deletions
diff --git a/Heimdall/Linux/README b/Heimdall/Linux/README index 97f04d5..d76bc33 100644 --- a/Heimdall/Linux/README +++ b/Heimdall/Linux/README @@ -59,8 +59,9 @@ Installing Heimdall Frontend from Source (Optional): cd heimdall-frontend
qmake heimdall-frontend.pro
make
+ sudo make install
- NOTE: You can use "checkinstall make" instead of "make" in order to
+ NOTE: You can use "checkinstall" instead of "make install" in order to
generate a redistributable package.
4. Done
diff --git a/Heimdall/OSX/README.txt b/Heimdall/OSX/README.txt index d155992..c5e82b0 100644 --- a/Heimdall/OSX/README.txt +++ b/Heimdall/OSX/README.txt @@ -49,7 +49,12 @@ Installing Heimdall from Source: sudo make install
cd ..
- 5. Done
+ 5. If you haven't installed the driver before, enter the following:
+
+ cd OSX
+ sudo ./install-kext.sh
+
+ 6. Done
Installing Heimdall Frontend from Source (Optional):
@@ -68,12 +73,10 @@ Installing Heimdall Frontend from Source (Optional): 4. This will produce an XCode project called heimdall-frontend.xcodeproj
in the heimdall-frontend folder. Open this file in XCode.
- 5. From the menu bar select Build -> Build. This will output a OS X
- application to the OSX sub-directory.
-
- 6. Move the output application to Applications or your preferred location.
+ 5. From the menu bar select Build -> Build. This outputs heimdall-frontend
+ to /Applications
- 7. Done
+ 6. Done
diff --git a/Heimdall/heimdall-frontend/heimdall-frontend.pro b/Heimdall/heimdall-frontend/heimdall-frontend.pro index d6c9d82..7e1049b 100644 --- a/Heimdall/heimdall-frontend/heimdall-frontend.pro +++ b/Heimdall/heimdall-frontend/heimdall-frontend.pro @@ -4,12 +4,33 @@ TEMPLATE = app
TARGET = heimdall-frontend
+
macx {
DESTDIR = ../OSX
+} else win32 { # It's recommended that Windows users compile via VS2010, but just in case...
+ DESTDIR = ../Win32
+} else {
+ DESTDIR = ../Linux
}
-!macx {
- DESTDIR = /usr/local/bin
+
+macx {
+ PROPOSEDINSTALLDIR = /Applications
+} else {
+ PROPOSEDINSTALLDIR = /usr/local/bin
}
+
+message("Install location:" $$PROPOSEDINSTALLDIR)
+DESIREDINSTALLDIR = $$prompt("Press ENTER to use the default location or type an alternative")
+
+equals(DESIREDINSTALLDIR, "") {
+ target.path = $$PROPOSEDINSTALLDIR
+} else {
+ target.path = $$DESIREDINSTALLDIR
+}
+
+
+INSTALLS += target
+
QT += core gui
CONFIG += release
DEFINES += QT_LARGEFILE_SUPPORT
|