len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rockbox Utility: use libipodpatcher.

Browse source 
Instead of building the sources directly build and link libipodpatcher.a as
done for other tools.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31326 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2011-12-16 19:34:18 +00:00
parent 98becd2076
commit d992536285
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rbutil/rbutilqt/rbutilqt.pri
View file

@ -28,7 +28,6 @@ SOURCES += \
base/talkfile.cpp \ base/talkfile.cpp \
base/talkgenerator.cpp \ base/talkgenerator.cpp \
base/autodetection.cpp \ base/autodetection.cpp \
../ipodpatcher/ipodpatcher.c \
../sansapatcher/sansapatcher.c \ ../sansapatcher/sansapatcher.c \
themesinstallwindow.cpp \ themesinstallwindow.cpp \
base/uninstall.cpp \ base/uninstall.cpp \
@ -88,9 +87,6 @@ HEADERS += \
base/autodetection.h \ base/autodetection.h \
base/progressloggerinterface.h \ base/progressloggerinterface.h \
progressloggergui.h \ progressloggergui.h \
../ipodpatcher/ipodpatcher.h \
../ipodpatcher/ipodio.h \
../ipodpatcher/parttypes.h \
../sansapatcher/sansapatcher.h \ ../sansapatcher/sansapatcher.h \
../sansapatcher/sansaio.h \ ../sansapatcher/sansaio.h \
irivertools/h100sums.h \ irivertools/h100sums.h \
@ -182,8 +178,6 @@ RESOURCES += $$_PRO_FILE_PWD_/rbutilqt.qrc
} }
# windows specific files # windows specific files
win32 { win32 {
SOURCES += ../ipodpatcher/ipodio-win32.c
SOURCES += ../ipodpatcher/ipodio-win32-scsi.c
SOURCES += ../sansapatcher/sansaio-win32.c SOURCES += ../sansapatcher/sansaio-win32.c
RC_FILE = rbutilqt.rc RC_FILE = rbutilqt.rc
RESOURCES += $$_PRO_FILE_PWD_/rbutilqt-win.qrc RESOURCES += $$_PRO_FILE_PWD_/rbutilqt-win.qrc
@ -191,7 +185,6 @@ win32 {
# unix specific files # unix specific files
unix { unix {
SOURCES += ../ipodpatcher/ipodio-posix.c
SOURCES += ../sansapatcher/sansaio-posix.c SOURCES += ../sansapatcher/sansaio-posix.c
} }

9
rbutil/rbutilqt/rbutilqt.pro
View file

@ -83,6 +83,12 @@ libucl.commands = @$(MAKE) -s \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \ TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \
libucl$$RBLIBPOSTFIX \ libucl$$RBLIBPOSTFIX \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
libipodpatcher.commands = @$(MAKE) -s \
BUILD_DIR=$$MYBUILDDIR/ipodpatcher/ \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/ipodpatcher \
APPVERSION=\"rbutil\" \
libipodpatcher$$RBLIBPOSTFIX \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
libmkamsboot.commands = @$(MAKE) -s \ libmkamsboot.commands = @$(MAKE) -s \
BUILD_DIR=$$MYBUILDDIR/mkamsboot/ \ BUILD_DIR=$$MYBUILDDIR/mkamsboot/ \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \ TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \
@ -109,7 +115,8 @@ libchinachip.commands = @$(MAKE) -s \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
# Note: order is important for RBLIBS! The libs are appended to the linker # Note: order is important for RBLIBS! The libs are appended to the linker
# flags in this order, put libucl at the end. # flags in this order, put libucl at the end.
RBLIBS = librbspeex libmkamsboot libmktccboot libmkmpioboot libchinachip libucl RBLIBS = librbspeex libipodpatcher libmkamsboot libmktccboot \
libmkmpioboot libchinachip libucl
QMAKE_EXTRA_TARGETS += $$RBLIBS QMAKE_EXTRA_TARGETS += $$RBLIBS
PRE_TARGETDEPS += $$RBLIBS PRE_TARGETDEPS += $$RBLIBS