diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-12-16 20:10:36 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-12-16 20:10:36 +0000 |
| commit | 8be58fd8ec6841cf7bb2597ab0c8986bd3292b3f (patch) | |
| tree | 97037761028c2554967e8977f2956ea571cbe5f8 /rbutil/rbutilqt | |
| parent | 1828bb8ea3f555fba987e1e5664a040c9376b6a6 (diff) | |
| download | rockbox-8be58fd8ec6841cf7bb2597ab0c8986bd3292b3f.tar.gz rockbox-8be58fd8ec6841cf7bb2597ab0c8986bd3292b3f.zip | |
Rockbox Utility: use libsansapatcher.
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
Diffstat (limited to 'rbutil/rbutilqt')
| -rw-r--r-- | rbutil/rbutilqt/rbutilqt.pri | 9 | ||||
| -rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pri b/rbutil/rbutilqt/rbutilqt.pri index cff4614358..66bcbcbf7c 100644 --- a/rbutil/rbutilqt/rbutilqt.pri +++ b/rbutil/rbutilqt/rbutilqt.pri @@ -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 diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index c4ce992707..c4990f54d6 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -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 |