diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-03-07 21:22:57 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-03-07 21:22:57 +0000 |
| commit | 8059347300775edaeb50eca784a39168c4b22826 (patch) | |
| tree | 64c74377c267c51528698af31860368b5a755ce0 | |
| parent | 77d409dd397d6c3af3ffca7747f30d066c4aa0eb (diff) | |
| download | rockbox-8059347300775edaeb50eca784a39168c4b22826.tar.gz rockbox-8059347300775edaeb50eca784a39168c4b22826.zip | |
Fix cross compiling on Linux: Python uses "linux2" as platform name.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29539 a1c6a512-1295-4272-9138-f99709370657
| -rwxr-xr-x | utils/common/deploy-rbutil.py | 6 | ||||
| -rwxr-xr-x | utils/common/deploy-themeeditor.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/utils/common/deploy-rbutil.py b/utils/common/deploy-rbutil.py index 27c6969e84..dea9f328ee 100755 --- a/utils/common/deploy-rbutil.py +++ b/utils/common/deploy-rbutil.py | |||
| @@ -50,19 +50,19 @@ deploy.bundlecopy = { | |||
| 50 | deploy.progexe = { | 50 | deploy.progexe = { |
| 51 | "win32" : "release/RockboxUtility.exe", | 51 | "win32" : "release/RockboxUtility.exe", |
| 52 | "darwin" : "RockboxUtility.app", | 52 | "darwin" : "RockboxUtility.app", |
| 53 | "linux" : "RockboxUtility" | 53 | "linux2" : "RockboxUtility" |
| 54 | } | 54 | } |
| 55 | # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are | 55 | # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are |
| 56 | # compatible with 10.4 requires using gcc-4.0. | 56 | # compatible with 10.4 requires using gcc-4.0. |
| 57 | deploy.qmakespec = { | 57 | deploy.qmakespec = { |
| 58 | "win32" : "", | 58 | "win32" : "", |
| 59 | "darwin" : "macx-g++40", | 59 | "darwin" : "macx-g++40", |
| 60 | "linux" : "" | 60 | "linux2" : "" |
| 61 | } | 61 | } |
| 62 | deploy.make = { | 62 | deploy.make = { |
| 63 | "win32" : "mingw32-make", | 63 | "win32" : "mingw32-make", |
| 64 | "darwin" : "make", | 64 | "darwin" : "make", |
| 65 | "linux" : "make" | 65 | "linux2" : "make" |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | # all files of the program. Will get put into an archive after building | 68 | # all files of the program. Will get put into an archive after building |
diff --git a/utils/common/deploy-themeeditor.py b/utils/common/deploy-themeeditor.py index 820856cd77..4569052e97 100755 --- a/utils/common/deploy-themeeditor.py +++ b/utils/common/deploy-themeeditor.py | |||
| @@ -33,19 +33,19 @@ deploy.bundlecopy = { | |||
| 33 | deploy.progexe = { | 33 | deploy.progexe = { |
| 34 | "win32" : "release/rbthemeeditor.exe", | 34 | "win32" : "release/rbthemeeditor.exe", |
| 35 | "darwin" : "rbthemeeditor.app", | 35 | "darwin" : "rbthemeeditor.app", |
| 36 | "linux" : "rbthemeeditor" | 36 | "linux2" : "rbthemeeditor" |
| 37 | } | 37 | } |
| 38 | # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are | 38 | # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are |
| 39 | # compatible with 10.4 requires using gcc-4.0. | 39 | # compatible with 10.4 requires using gcc-4.0. |
| 40 | deploy.qmakespec = { | 40 | deploy.qmakespec = { |
| 41 | "win32" : "", | 41 | "win32" : "", |
| 42 | "darwin" : "macx-g++40", | 42 | "darwin" : "macx-g++40", |
| 43 | "linux" : "" | 43 | "linux2" : "" |
| 44 | } | 44 | } |
| 45 | deploy.make = { | 45 | deploy.make = { |
| 46 | "win32" : "mingw32-make", | 46 | "win32" : "mingw32-make", |
| 47 | "darwin" : "make", | 47 | "darwin" : "make", |
| 48 | "linux" : "make" | 48 | "linux2" : "make" |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | # all files of the program. Will get put into an archive after building | 51 | # all files of the program. Will get put into an archive after building |