Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Theme Editor: make cross compiling on OS X work.

Browse source 
The attempt to detect if building a fat library is necessary for libskin_parser
makes cross compiling fail on OS X. Allow overriding the target platform for
libskin_parser to fix that.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29515 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2011-03-05 12:50:46 +00:00
parent 57bf8058e5
commit 8c6b8e6cd5
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/skin_parser/Makefile
View file

@ -18,6 +18,7 @@ TARGET_DIR ?= ./
# construct build directory if BUILDDIR is not set. # construct build directory if BUILDDIR is not set.
BUILDDIR ?= $(TARGET_DIR)build BUILDDIR ?= $(TARGET_DIR)build
TARGETPLATFORM ?= $(shell uname)
ifdef RBARCH ifdef RBARCH
CFLAGS += -arch $(RBARCH) CFLAGS += -arch $(RBARCH)
@ -37,7 +38,7 @@ $(OBJDIR)%.o: %.c
$(SILENT)mkdir -p $(dir $@) $(SILENT)mkdir -p $(dir $@)
$(SILENT)$(CC) $(CFLAGS) -c -o $@ $< $(SILENT)$(CC) $(CFLAGS) -c -o $@ $<
ifeq ($(findstring Darwin,$(shell uname)),Darwin) ifeq ($(findstring Darwin,$(TARGETPLATFORM)),Darwin)
# some trickery to build ppc and i386 from a single call # some trickery to build ppc and i386 from a single call
$(OUTPUT).a: $(TARGET_DIR)$(OUTPUT)i386.a $(TARGET_DIR)$(OUTPUT)ppc.a $(OUTPUT).a: $(TARGET_DIR)$(OUTPUT)i386.a $(TARGET_DIR)$(OUTPUT)ppc.a
@echo lipo $(TARGET_DIR)$@ @echo lipo $(TARGET_DIR)$@

2
utils/themeeditor/themeeditor.pro
View file

@ -40,7 +40,7 @@ cross {
# retrieve ar binary for w32 cross compile. This might be specific to # retrieve ar binary for w32 cross compile. This might be specific to
# Fedora mingw32 packages of Qt. Using member() here is needed because at # Fedora mingw32 packages of Qt. Using member() here is needed because at
# least the F13 packages add ar options to the variable. # least the F13 packages add ar options to the variable.
CROSSOPTIONS += AR=$$member(QMAKE_LIB) CROSSOPTIONS += AR=$$member(QMAKE_LIB) TARGETPLATFORM=\"MinGW\"
# make sure we use the correct subsystem to prevent a console window coming up. # make sure we use the correct subsystem to prevent a console window coming up.
LIBS += -Wl,-subsystem,windows LIBS += -Wl,-subsystem,windows