diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-08-30 17:52:01 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-08-30 17:52:01 +0000 |
| commit | b81a116f7fc77b5b67e41bb5d378c8086677e5cb (patch) | |
| tree | a43e016f46ca631d129de35e0329f63d18ad95c2 | |
| parent | 4756a77b47cc4a0c86315d8949468b347268c8eb (diff) | |
| download | rockbox-b81a116f7fc77b5b67e41bb5d378c8086677e5cb.tar.gz rockbox-b81a116f7fc77b5b67e41bb5d378c8086677e5cb.zip | |
Update INSTALL file and move it in preparation of merging rbutil/ and utils/.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27946 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | rbutil/rbutil.pro | 2 | ||||
| -rw-r--r-- | rbutil/rbutilqt/INSTALL (renamed from rbutil/INSTALL) | 24 |
2 files changed, 18 insertions, 8 deletions
diff --git a/rbutil/rbutil.pro b/rbutil/rbutil.pro deleted file mode 100644 index 7e8f422402..0000000000 --- a/rbutil/rbutil.pro +++ /dev/null | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | SUBDIRS = rbutilqt | ||
| 2 | TEMPLATE = subdirs \ No newline at end of file | ||
diff --git a/rbutil/INSTALL b/rbutil/rbutilqt/INSTALL index 55b0dcd3cf..a145c2cb74 100644 --- a/rbutil/INSTALL +++ b/rbutil/rbutilqt/INSTALL | |||
| @@ -20,9 +20,9 @@ for Rockbox. | |||
| 20 | 20 | ||
| 21 | Requirements: | 21 | Requirements: |
| 22 | ============= | 22 | ============= |
| 23 | - Qt 4.3.0 or greater | 23 | - Qt 4.5.0 or greater |
| 24 | - at least the following folders from Rockbox svn: | 24 | - at least the following folders from Rockbox svn: |
| 25 | o apps/ | 25 | o apps/codecs/libspeex |
| 26 | o rbutil/ | 26 | o rbutil/ |
| 27 | o tools/ | 27 | o tools/ |
| 28 | - libusb (Linux, Mac) | 28 | - libusb (Linux, Mac) |
| @@ -31,8 +31,17 @@ Building: | |||
| 31 | ========= | 31 | ========= |
| 32 | - run qmake | 32 | - run qmake |
| 33 | - run make | 33 | - run make |
| 34 | The resulting binary will be located in the rbutilqt subfolder. If you have | 34 | |
| 35 | multiple versions of Qt installed make sure to pick the correct one. | 35 | Build Options: |
| 36 | ============== | ||
| 37 | - static | ||
| 38 | add "-config static" to the qmake call to build a static binary. Note that | ||
| 39 | this also requires that you have a statically built version of Qt. | ||
| 40 | - dbg | ||
| 41 | add "-config dbg" to build with debug symbols. | ||
| 42 | - silent | ||
| 43 | add "-config silent" to the qmake call. This is an undocumented feature of | ||
| 44 | Qt itself. Note that this doesn't seem to work on Windows and Mac OS X. | ||
| 36 | 45 | ||
| 37 | Installation / Deployment: | 46 | Installation / Deployment: |
| 38 | ========================== | 47 | ========================== |
| @@ -40,10 +49,13 @@ Rockbox Utility is build as all-in-one binary. This means for distribution | |||
| 40 | you need: | 49 | you need: |
| 41 | - RockboxUtility (main binary) | 50 | - RockboxUtility (main binary) |
| 42 | - rbutil_*.qm (translation files, optional) | 51 | - rbutil_*.qm (translation files, optional) |
| 43 | You don't need any other files like configuration files, especially | 52 | You don't need any other files like configuration files, especially |
| 44 | rbutil.ini which will get included into the binary. | 53 | rbutil.ini which will get included into the binary. |
| 45 | 54 | ||
| 55 | The script deploy-release.py automates building deployment binaries. For a | ||
| 56 | complete list of paths to get from svn to build please check its source. | ||
| 57 | |||
| 46 | 58 | ||
| 47 | The website for Rockbox Utility is | 59 | The website for Rockbox Utility is |
| 48 | http://www.rockbox.org/wiki/RockboxUtility | 60 | http://www.rockbox.org/wiki/RockboxUtility |
| 49 | 61 | ||