From 7de4f64bb6f1630c1b62767f69b7ce00936f5fa1 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 3 Dec 2011 09:44:21 +0000 Subject: Rockbox Utility: build chinachippatcher as library. Update the chinachip Makefile based on the mkamsboot one, build and link as library for Rockbox Utility. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31117 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/rbutilqt.pri | 2 -- rbutil/rbutilqt/rbutilqt.pro | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'rbutil/rbutilqt') diff --git a/rbutil/rbutilqt/rbutilqt.pri b/rbutil/rbutilqt/rbutilqt.pri index 0f887d7070..a0f4d550aa 100644 --- a/rbutil/rbutilqt/rbutilqt.pri +++ b/rbutil/rbutilqt/rbutilqt.pri @@ -30,7 +30,6 @@ SOURCES += \ base/autodetection.cpp \ ../ipodpatcher/ipodpatcher.c \ ../sansapatcher/sansapatcher.c \ - ../chinachippatcher/chinachip.c \ themesinstallwindow.cpp \ base/uninstall.cpp \ uninstallwindow.cpp \ @@ -94,7 +93,6 @@ HEADERS += \ ../ipodpatcher/parttypes.h \ ../sansapatcher/sansapatcher.h \ ../sansapatcher/sansaio.h \ - ../chinachippatcher/chinachip.h \ irivertools/h100sums.h \ irivertools/h120sums.h \ irivertools/h300sums.h \ diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index fc547525aa..e8e2ac9fe0 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -95,9 +95,14 @@ libmkmpioboot.commands = @$(MAKE) -s \ APPVERSION=\"rbutil\" \ libmkmpioboot$$RBLIBPOSTFIX \ CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" +libchinachip.commands = @$(MAKE) -s \ + TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/chinachippatcher \ + APPVERSION=\"rbutil\" \ + libchinachip$$RBLIBPOSTFIX \ + CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" # Note: order is important for RBLIBS! The libs are appended to the linker # flags in this order, put libucl at the end. -RBLIBS = librbspeex libmkamsboot libmktccboot libmkmpioboot libucl +RBLIBS = librbspeex libmkamsboot libmktccboot libmkmpioboot libchinachip libucl QMAKE_EXTRA_TARGETS += $$RBLIBS PRE_TARGETDEPS += $$RBLIBS -- cgit