diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-07-06 21:08:16 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-07-06 21:08:16 +0000 |
commit | e464128c546748edc9b54355a7cc45ab1b71f6eb (patch) | |
tree | 3f9ad2d48d142d4237e8bcdc7287153d5a4166ca /utils/themeeditor | |
parent | eccc2bd009e967e45d38a573080d13a1339eb0a6 (diff) | |
download | rockbox-e464128c546748edc9b54355a7cc45ab1b71f6eb.tar.gz rockbox-e464128c546748edc9b54355a7cc45ab1b71f6eb.zip |
Rework libskin_parser Makefile for OS X support.
- add similar trickery that is used for the libraries used by Rockbox Utility
to allow building as universal binary.
- don't overwrite CC, we need to set this from outside for building OS X 10.4
compatible binaries.
- extend Theme Editor project file to build 10.4 compatible binaries on OS X.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27323 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor')
-rw-r--r-- | utils/themeeditor/themeeditor.pro | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro index 8a16fa926a..19c01fa082 100644 --- a/utils/themeeditor/themeeditor.pro +++ b/utils/themeeditor/themeeditor.pro | |||
@@ -14,15 +14,15 @@ INCLUDEPATH += graphics | |||
14 | 14 | ||
15 | # Stuff for the parse lib | 15 | # Stuff for the parse lib |
16 | libskin_parser.commands = @$(MAKE) \ | 16 | libskin_parser.commands = @$(MAKE) \ |
17 | TARGET_DIR=$$MYBUILDDIR CC=\"$$QMAKE_CC\" \ | ||
17 | BUILDDIR=$$OBJECTS_DIR \ | 18 | BUILDDIR=$$OBJECTS_DIR \ |
18 | -C \ | 19 | -C $$RBBASE_DIR/lib/skin_parser \ |
19 | $$RBBASE_DIR/lib/skin_parser \ | 20 | libskin_parser.a |
20 | CC=\"$$QMAKE_CC\" | 21 | |
21 | QMAKE_EXTRA_TARGETS += libskin_parser | 22 | QMAKE_EXTRA_TARGETS += libskin_parser |
22 | PRE_TARGETDEPS += libskin_parser | 23 | PRE_TARGETDEPS += libskin_parser |
23 | INCLUDEPATH += $$RBBASE_DIR/lib/skin_parser | 24 | INCLUDEPATH += $$RBBASE_DIR/lib/skin_parser |
24 | LIBS += -L$$OBJECTS_DIR \ | 25 | LIBS += -L$$MYBUILDDIR -lskin_parser |
25 | -lskin_parser | ||
26 | DEPENDPATH = $$INCLUDEPATH | 26 | DEPENDPATH = $$INCLUDEPATH |
27 | HEADERS += models/parsetreemodel.h \ | 27 | HEADERS += models/parsetreemodel.h \ |
28 | models/parsetreenode.h \ | 28 | models/parsetreenode.h \ |
@@ -82,3 +82,11 @@ FORMS += gui/editorwindow.ui \ | |||
82 | gui/skinviewer.ui \ | 82 | gui/skinviewer.ui \ |
83 | gui/findreplacedialog.ui | 83 | gui/findreplacedialog.ui |
84 | RESOURCES += resources.qrc | 84 | RESOURCES += resources.qrc |
85 | |||
86 | macx { | ||
87 | QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk | ||
88 | QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc | ||
89 | QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386 | ||
90 | CONFIG+=x86 ppc | ||
91 | } | ||
92 | |||