diff options
Diffstat (limited to 'rbutil')
-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 += \ | |||
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 | ../sansapatcher/sansapatcher.c \ | ||
32 | themesinstallwindow.cpp \ | 31 | themesinstallwindow.cpp \ |
33 | base/uninstall.cpp \ | 32 | base/uninstall.cpp \ |
34 | uninstallwindow.cpp \ | 33 | uninstallwindow.cpp \ |
@@ -87,8 +86,6 @@ HEADERS += \ | |||
87 | base/autodetection.h \ | 86 | base/autodetection.h \ |
88 | base/progressloggerinterface.h \ | 87 | base/progressloggerinterface.h \ |
89 | progressloggergui.h \ | 88 | progressloggergui.h \ |
90 | ../sansapatcher/sansapatcher.h \ | ||
91 | ../sansapatcher/sansaio.h \ | ||
92 | irivertools/h100sums.h \ | 89 | irivertools/h100sums.h \ |
93 | irivertools/h120sums.h \ | 90 | irivertools/h120sums.h \ |
94 | irivertools/h300sums.h \ | 91 | irivertools/h300sums.h \ |
@@ -178,16 +175,10 @@ RESOURCES += $$_PRO_FILE_PWD_/rbutilqt.qrc | |||
178 | } | 175 | } |
179 | # windows specific files | 176 | # windows specific files |
180 | win32 { | 177 | win32 { |
181 | SOURCES += ../sansapatcher/sansaio-win32.c | ||
182 | RC_FILE = rbutilqt.rc | 178 | RC_FILE = rbutilqt.rc |
183 | RESOURCES += $$_PRO_FILE_PWD_/rbutilqt-win.qrc | 179 | RESOURCES += $$_PRO_FILE_PWD_/rbutilqt-win.qrc |
184 | } | 180 | } |
185 | 181 | ||
186 | # unix specific files | ||
187 | unix { | ||
188 | SOURCES += ../sansapatcher/sansaio-posix.c | ||
189 | } | ||
190 | |||
191 | # mac specific files | 182 | # mac specific files |
192 | macx { | 183 | macx { |
193 | SOURCES += base/ttscarbon.cpp | 184 | 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 \ | |||
89 | APPVERSION=\"rbutil\" \ | 89 | APPVERSION=\"rbutil\" \ |
90 | libipodpatcher$$RBLIBPOSTFIX \ | 90 | libipodpatcher$$RBLIBPOSTFIX \ |
91 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" | 91 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" |
92 | libsansapatcher.commands = @$(MAKE) -s \ | ||
93 | BUILD_DIR=$$MYBUILDDIR/sansapatcher/ \ | ||
94 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/sansapatcher \ | ||
95 | APPVERSION=\"rbutil\" \ | ||
96 | libsansapatcher$$RBLIBPOSTFIX \ | ||
97 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" | ||
92 | libmkamsboot.commands = @$(MAKE) -s \ | 98 | libmkamsboot.commands = @$(MAKE) -s \ |
93 | BUILD_DIR=$$MYBUILDDIR/mkamsboot/ \ | 99 | BUILD_DIR=$$MYBUILDDIR/mkamsboot/ \ |
94 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \ | 100 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \ |
@@ -115,7 +121,7 @@ libchinachip.commands = @$(MAKE) -s \ | |||
115 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" | 121 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" |
116 | # Note: order is important for RBLIBS! The libs are appended to the linker | 122 | # Note: order is important for RBLIBS! The libs are appended to the linker |
117 | # flags in this order, put libucl at the end. | 123 | # flags in this order, put libucl at the end. |
118 | RBLIBS = librbspeex libipodpatcher libmkamsboot libmktccboot \ | 124 | RBLIBS = librbspeex libipodpatcher libsansapatcher libmkamsboot libmktccboot \ |
119 | libmkmpioboot libchinachip libucl | 125 | libmkmpioboot libchinachip libucl |
120 | QMAKE_EXTRA_TARGETS += $$RBLIBS | 126 | QMAKE_EXTRA_TARGETS += $$RBLIBS |
121 | PRE_TARGETDEPS += $$RBLIBS | 127 | PRE_TARGETDEPS += $$RBLIBS |