devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix building universal binaries.

Browse source 
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
This commit is contained in:
Dominik Riebeling 2009-11-28 22:39:05 +00:00
parent cca6f747f8
commit f0d0ba86ff
5 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rbutil/mkamsboot/Makefile
View file

@ -6,7 +6,6 @@ endif
# We use the UCL code available in the Rockbox tools/ directory # We use the UCL code available in the Rockbox tools/ directory
CFLAGS=-I../../tools/ucl/include -Wall -DVERSION=\"$(APPVERSION)\" CFLAGS=-I../../tools/ucl/include -Wall -DVERSION=\"$(APPVERSION)\"
CC = gcc
ifndef V ifndef V
SILENT = @ SILENT = @

2
rbutil/mktccboot/Makefile
View file

@ -11,8 +11,6 @@
TOOLSDIR=../../tools TOOLSDIR=../../tools
CFLAGS := -O -g -W -Wall -Wshadow -pedantic -I$(TOOLSDIR) CFLAGS := -O -g -W -Wall -Wshadow -pedantic -I$(TOOLSDIR)
CC = gcc
ifndef V ifndef V
SILENT = @ SILENT = @
endif endif

16
rbutil/rbutilqt/rbutilqt.pro
View file

@ -39,17 +39,15 @@ LIBSPEEX = $$system(pkg-config --silence-errors --libs speex)
} }
# custom rules for rockbox-specific libs # custom rules for rockbox-specific libs
!mac { !mac {
rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex.a RBLIBPOSTFIX = .a
libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl.a
libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot.a
libmktccboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot libmktccboot.a
} }
mac { mac {
rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex-universal RBLIBPOSTFIX = -universal
libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl-universal
libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot-universal
libmktccboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot libmktccboot-universal
} }
rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
libmktccboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot libmktccboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot
PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot
@ -271,7 +269,7 @@ macx {
QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc
QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386 QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386
CONFIG+=x86 ppc CONFIG+=x86 ppc
LIBS += -L/usr/local/lib -framework IOKit LIBS += -L/usr/local/lib -framework IOKit -lz
INCLUDEPATH += /usr/local/include INCLUDEPATH += /usr/local/include
QMAKE_INFO_PLIST = Info.plist QMAKE_INFO_PLIST = Info.plist
RC_FILE = icons/rbutilqt.icns RC_FILE = icons/rbutilqt.icns

4
tools/rbspeex/Makefile
View file

@ -22,10 +22,6 @@ CFLAGS = $(SPEEXOPTS) $(INCLUDES) -O3 -fomit-frame-pointer -Wno-unused-parameter
ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
CFLAGS+=-mno-cygwin CFLAGS+=-mno-cygwin
endif endif
# on mingw32, make sure CC is set to gcc
ifeq ($(findstring MINGW,$(shell uname)),MINGW)
CC = gcc
endif
ifdef RBARCH ifdef RBARCH
CFLAGS += -arch $(RBARCH) CFLAGS += -arch $(RBARCH)

1
tools/ucl/src/Makefile
View file

@ -7,7 +7,6 @@
# $Id$ # $Id$
# #
CFLAGS = -I../include CFLAGS = -I../include
CC = gcc
ifndef V ifndef V
SILENT = @ SILENT = @