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

Rockbox Utility: use libsansapatcher.

Browse source 
Instead of building sansapatcher sources directly build and use the library.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31329 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2011-12-16 20:10:36 +00:00
parent 1828bb8ea3
commit 8be58fd8ec
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rbutil/rbutilqt/rbutilqt.pri
View file

@ -28,7 +28,6 @@ SOURCES += \
base/talkfile.cpp \
base/talkgenerator.cpp \
base/autodetection.cpp \
../sansapatcher/sansapatcher.c \
themesinstallwindow.cpp \
base/uninstall.cpp \
uninstallwindow.cpp \
@ -87,8 +86,6 @@ HEADERS += \
base/autodetection.h \
base/progressloggerinterface.h \
progressloggergui.h \
../sansapatcher/sansapatcher.h \
../sansapatcher/sansaio.h \
irivertools/h100sums.h \
irivertools/h120sums.h \
irivertools/h300sums.h \
@ -178,16 +175,10 @@ RESOURCES += $$_PRO_FILE_PWD_/rbutilqt.qrc
}
# windows specific files
win32 {
SOURCES += ../sansapatcher/sansaio-win32.c
RC_FILE = rbutilqt.rc
RESOURCES += $$_PRO_FILE_PWD_/rbutilqt-win.qrc
}
# unix specific files
unix {
SOURCES += ../sansapatcher/sansaio-posix.c
}
# mac specific files
macx {
SOURCES += base/ttscarbon.cpp

8
rbutil/rbutilqt/rbutilqt.pro
View file

@ -89,6 +89,12 @@ libipodpatcher.commands = @$(MAKE) -s \
APPVERSION=\"rbutil\" \
libipodpatcher$$RBLIBPOSTFIX \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
libsansapatcher.commands = @$(MAKE) -s \
BUILD_DIR=$$MYBUILDDIR/sansapatcher/ \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/sansapatcher \
APPVERSION=\"rbutil\" \
libsansapatcher$$RBLIBPOSTFIX \
CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
libmkamsboot.commands = @$(MAKE) -s \
BUILD_DIR=$$MYBUILDDIR/mkamsboot/ \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \
@ -115,7 +121,7 @@ libchinachip.commands = @$(MAKE) -s \
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 libipodpatcher libmkamsboot libmktccboot \
RBLIBS = librbspeex libipodpatcher libsansapatcher libmkamsboot libmktccboot \
libmkmpioboot libchinachip libucl
QMAKE_EXTRA_TARGETS += $$RBLIBS
PRE_TARGETDEPS += $$RBLIBS