Theme Editor: make cross compiling on OS X work.

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

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/skin_parser/Makefile b/lib/skin_parser/Makefile
index fe417dbc58..5105b040fd 100644
--- a/lib/skin_parser/Makefile
+++ b/lib/skin_parser/Makefile
@@ -18,6 +18,7 @@ TARGET_DIR ?= ./
 
 # construct build directory if BUILDDIR is not set.
 BUILDDIR ?= $(TARGET_DIR)build
+TARGETPLATFORM ?= $(shell uname)
 
 ifdef RBARCH
 CFLAGS += -arch $(RBARCH)
@@ -37,7 +38,7 @@ $(OBJDIR)%.o: %.c
         $(SILENT)mkdir -p $(dir $@)
         $(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
 $(OUTPUT).a: $(TARGET_DIR)$(OUTPUT)i386.a $(TARGET_DIR)$(OUTPUT)ppc.a
         @echo lipo $(TARGET_DIR)$@
diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro
index b8d1dd3523..45300e4b8f 100644
--- a/utils/themeeditor/themeeditor.pro
+++ b/utils/themeeditor/themeeditor.pro
@@ -40,7 +40,7 @@ cross {
     # retrieve ar binary for w32 cross compile. This might be specific to
     # Fedora mingw32 packages of Qt. Using member() here is needed because at
     # 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.
     LIBS += -Wl,-subsystem,windows