diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-12-16 19:34:18 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-12-16 19:34:18 +0000 |
commit | d992536285e101ac5a57f8a81cd7bc4ff6a62225 (patch) | |
tree | 3ce9fd3e801264917f738a903cd4bb2073c410a7 | |
parent | 98becd207623718b851c44d919077f51e338a5c5 (diff) | |
download | rockbox-d992536285e101ac5a57f8a81cd7bc4ff6a62225.tar.gz rockbox-d992536285e101ac5a57f8a81cd7bc4ff6a62225.zip |
Rockbox Utility: use libipodpatcher.
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
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pri | 7 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pri b/rbutil/rbutilqt/rbutilqt.pri index a0f4d550aa..cff4614358 100644 --- a/rbutil/rbutilqt/rbutilqt.pri +++ b/rbutil/rbutilqt/rbutilqt.pri | |||
@@ -28,7 +28,6 @@ SOURCES += \ | |||
28 | base/talkfile.cpp \ | 28 | base/talkfile.cpp \ |
29 | base/talkgenerator.cpp \ | 29 | base/talkgenerator.cpp \ |
30 | base/autodetection.cpp \ | 30 | base/autodetection.cpp \ |
31 | ../ipodpatcher/ipodpatcher.c \ | ||
32 | ../sansapatcher/sansapatcher.c \ | 31 | ../sansapatcher/sansapatcher.c \ |
33 | themesinstallwindow.cpp \ | 32 | themesinstallwindow.cpp \ |
34 | base/uninstall.cpp \ | 33 | base/uninstall.cpp \ |
@@ -88,9 +87,6 @@ HEADERS += \ | |||
88 | base/autodetection.h \ | 87 | base/autodetection.h \ |
89 | base/progressloggerinterface.h \ | 88 | base/progressloggerinterface.h \ |
90 | progressloggergui.h \ | 89 | progressloggergui.h \ |
91 | ../ipodpatcher/ipodpatcher.h \ | ||
92 | ../ipodpatcher/ipodio.h \ | ||
93 | ../ipodpatcher/parttypes.h \ | ||
94 | ../sansapatcher/sansapatcher.h \ | 90 | ../sansapatcher/sansapatcher.h \ |
95 | ../sansapatcher/sansaio.h \ | 91 | ../sansapatcher/sansaio.h \ |
96 | irivertools/h100sums.h \ | 92 | irivertools/h100sums.h \ |
@@ -182,8 +178,6 @@ RESOURCES += $$_PRO_FILE_PWD_/rbutilqt.qrc | |||
182 | } | 178 | } |
183 | # windows specific files | 179 | # windows specific files |
184 | win32 { | 180 | win32 { |
185 | SOURCES += ../ipodpatcher/ipodio-win32.c | ||
186 | SOURCES += ../ipodpatcher/ipodio-win32-scsi.c | ||
187 | SOURCES += ../sansapatcher/sansaio-win32.c | 181 | SOURCES += ../sansapatcher/sansaio-win32.c |
188 | RC_FILE = rbutilqt.rc | 182 | RC_FILE = rbutilqt.rc |
189 | RESOURCES += $$_PRO_FILE_PWD_/rbutilqt-win.qrc | 183 | RESOURCES += $$_PRO_FILE_PWD_/rbutilqt-win.qrc |
@@ -191,7 +185,6 @@ win32 { | |||
191 | 185 | ||
192 | # unix specific files | 186 | # unix specific files |
193 | unix { | 187 | unix { |
194 | SOURCES += ../ipodpatcher/ipodio-posix.c | ||
195 | SOURCES += ../sansapatcher/sansaio-posix.c | 188 | SOURCES += ../sansapatcher/sansaio-posix.c |
196 | } | 189 | } |
197 | 190 | ||
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 3e5b7d0b27..c4ce992707 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -83,6 +83,12 @@ libucl.commands = @$(MAKE) -s \ | |||
83 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \ | 83 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \ |
84 | libucl$$RBLIBPOSTFIX \ | 84 | libucl$$RBLIBPOSTFIX \ |
85 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" | 85 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" |
86 | libipodpatcher.commands = @$(MAKE) -s \ | ||
87 | BUILD_DIR=$$MYBUILDDIR/ipodpatcher/ \ | ||
88 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/ipodpatcher \ | ||
89 | APPVERSION=\"rbutil\" \ | ||
90 | libipodpatcher$$RBLIBPOSTFIX \ | ||
91 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" | ||
86 | libmkamsboot.commands = @$(MAKE) -s \ | 92 | libmkamsboot.commands = @$(MAKE) -s \ |
87 | BUILD_DIR=$$MYBUILDDIR/mkamsboot/ \ | 93 | BUILD_DIR=$$MYBUILDDIR/mkamsboot/ \ |
88 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \ | 94 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \ |
@@ -109,7 +115,8 @@ libchinachip.commands = @$(MAKE) -s \ | |||
109 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" | 115 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" |
110 | # Note: order is important for RBLIBS! The libs are appended to the linker | 116 | # Note: order is important for RBLIBS! The libs are appended to the linker |
111 | # flags in this order, put libucl at the end. | 117 | # flags in this order, put libucl at the end. |
112 | RBLIBS = librbspeex libmkamsboot libmktccboot libmkmpioboot libchinachip libucl | 118 | RBLIBS = librbspeex libipodpatcher libmkamsboot libmktccboot \ |
119 | libmkmpioboot libchinachip libucl | ||
113 | QMAKE_EXTRA_TARGETS += $$RBLIBS | 120 | QMAKE_EXTRA_TARGETS += $$RBLIBS |
114 | PRE_TARGETDEPS += $$RBLIBS | 121 | PRE_TARGETDEPS += $$RBLIBS |
115 | 122 | ||