diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-11-28 22:39:05 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-11-28 22:39:05 +0000 |
commit | f0d0ba86ff32ba8f4cffebcc9d6984e7000e8257 (patch) | |
tree | e3cff909d6264de689b0ba3235df3b9656773976 /rbutil | |
parent | cca6f747f807105fd7a8e4834ebd73a5a996d8d2 (diff) | |
download | rockbox-f0d0ba86ff32ba8f4cffebcc9d6984e7000e8257.tar.gz rockbox-f0d0ba86ff32ba8f4cffebcc9d6984e7000e8257.zip |
Fix building universal binaries.
When building various libraries for Rockbox Utility make sure they use the same compiler as Qt. Pass Qt's CC instead of explicitly setting it. This fixes issues linking on OS X (with recent XCode building universal binaries requires the use of gcc-4-0 while the default one is 4.2).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23779 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/mkamsboot/Makefile | 1 | ||||
-rw-r--r-- | rbutil/mktccboot/Makefile | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 16 |
3 files changed, 7 insertions, 12 deletions
diff --git a/rbutil/mkamsboot/Makefile b/rbutil/mkamsboot/Makefile index 37163600fc..70b79aa059 100644 --- a/rbutil/mkamsboot/Makefile +++ b/rbutil/mkamsboot/Makefile | |||
@@ -6,7 +6,6 @@ endif | |||
6 | 6 | ||
7 | # We use the UCL code available in the Rockbox tools/ directory | 7 | # We use the UCL code available in the Rockbox tools/ directory |
8 | CFLAGS=-I../../tools/ucl/include -Wall -DVERSION=\"$(APPVERSION)\" | 8 | CFLAGS=-I../../tools/ucl/include -Wall -DVERSION=\"$(APPVERSION)\" |
9 | CC = gcc | ||
10 | 9 | ||
11 | ifndef V | 10 | ifndef V |
12 | SILENT = @ | 11 | SILENT = @ |
diff --git a/rbutil/mktccboot/Makefile b/rbutil/mktccboot/Makefile index 14c184321c..61737651b7 100644 --- a/rbutil/mktccboot/Makefile +++ b/rbutil/mktccboot/Makefile | |||
@@ -11,8 +11,6 @@ | |||
11 | TOOLSDIR=../../tools | 11 | TOOLSDIR=../../tools |
12 | CFLAGS := -O -g -W -Wall -Wshadow -pedantic -I$(TOOLSDIR) | 12 | CFLAGS := -O -g -W -Wall -Wshadow -pedantic -I$(TOOLSDIR) |
13 | 13 | ||
14 | CC = gcc | ||
15 | |||
16 | ifndef V | 14 | ifndef V |
17 | SILENT = @ | 15 | SILENT = @ |
18 | endif | 16 | endif |
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 90949fcc43..b09bd19bab 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -39,17 +39,15 @@ LIBSPEEX = $$system(pkg-config --silence-errors --libs speex) | |||
39 | } | 39 | } |
40 | # custom rules for rockbox-specific libs | 40 | # custom rules for rockbox-specific libs |
41 | !mac { | 41 | !mac { |
42 | rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex.a | 42 | RBLIBPOSTFIX = .a |
43 | libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl.a | ||
44 | libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot.a | ||
45 | libmktccboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot libmktccboot.a | ||
46 | } | 43 | } |
47 | mac { | 44 | mac { |
48 | rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex-universal | 45 | RBLIBPOSTFIX = -universal |
49 | libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl-universal | ||
50 | libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot-universal | ||
51 | libmktccboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot libmktccboot-universal | ||
52 | } | 46 | } |
47 | rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" | ||
48 | libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" | ||
49 | libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" | ||
50 | libmktccboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot libmktccboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" | ||
53 | QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot | 51 | QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot |
54 | PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot | 52 | PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot |
55 | 53 | ||
@@ -271,7 +269,7 @@ macx { | |||
271 | QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc | 269 | QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc |
272 | QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386 | 270 | QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386 |
273 | CONFIG+=x86 ppc | 271 | CONFIG+=x86 ppc |
274 | LIBS += -L/usr/local/lib -framework IOKit | 272 | LIBS += -L/usr/local/lib -framework IOKit -lz |
275 | INCLUDEPATH += /usr/local/include | 273 | INCLUDEPATH += /usr/local/include |
276 | QMAKE_INFO_PLIST = Info.plist | 274 | QMAKE_INFO_PLIST = Info.plist |
277 | RC_FILE = icons/rbutilqt.icns | 275 | RC_FILE = icons/rbutilqt.icns |