diff options
-rw-r--r-- | tools/Makefile | 7 | ||||
-rwxr-xr-x | tools/configure | 2 | ||||
-rw-r--r-- | utils/MTP/beastpatcher/Makefile | 14 | ||||
-rw-r--r-- | utils/MTP/beastpatcher/mknkboot.c (renamed from tools/mknkboot.c) | 0 | ||||
-rw-r--r-- | utils/MTP/beastpatcher/mknkboot.h (renamed from tools/mknkboot.h) | 0 |
5 files changed, 11 insertions, 12 deletions
diff --git a/tools/Makefile b/tools/Makefile index b7f5c860d8..71fb6bff92 100644 --- a/tools/Makefile +++ b/tools/Makefile | |||
@@ -13,10 +13,10 @@ LDFLAGS := -g | |||
13 | 13 | ||
14 | CLEANALL := scramble descramble iriver sh2d bmp2rb rdf2binary convbdf \ | 14 | CLEANALL := scramble descramble iriver sh2d bmp2rb rdf2binary convbdf \ |
15 | generate_rocklatin mkboot ipod_fw codepages uclpack mi4 gigabeat \ | 15 | generate_rocklatin mkboot ipod_fw codepages uclpack mi4 gigabeat \ |
16 | lngdump telechips gigabeats creative hmac-sha1 mktccboot mknkboot rbspeexenc \ | 16 | lngdump telechips gigabeats creative hmac-sha1 mktccboot rbspeexenc \ |
17 | mkzenboot mk500boot | 17 | mkzenboot mk500boot |
18 | 18 | ||
19 | all: scramble descramble sh2d rdf2binary mkboot mktccboot mknkboot mkzenboot \ | 19 | all: scramble descramble sh2d rdf2binary mkboot mktccboot mkzenboot \ |
20 | convbdf codepages uclpack rbspeexenc voicefont mk500boot | 20 | convbdf codepages uclpack rbspeexenc voicefont mk500boot |
21 | 21 | ||
22 | scramble: scramble.o iriver.o mi4.o gigabeat.o gigabeats.o telechips.o iaudio_bl_flash.o creative.o hmac-sha1.o | 22 | scramble: scramble.o iriver.o mi4.o gigabeat.o gigabeats.o telechips.o iaudio_bl_flash.o creative.o hmac-sha1.o |
@@ -52,9 +52,6 @@ mktccboot: mktccboot.c telechips.o | |||
52 | mk500boot: mk500boot.c mr500.c | 52 | mk500boot: mk500boot.c mr500.c |
53 | $(SILENT)$(CC) $(CFLAGS) $+ -o $@ | 53 | $(SILENT)$(CC) $(CFLAGS) $+ -o $@ |
54 | 54 | ||
55 | mknkboot: mknkboot.c | ||
56 | $(SILENT)$(CC) $(CFLAGS) $+ -o $@ | ||
57 | |||
58 | mkzenboot.o: mkzenboot.c | 55 | mkzenboot.o: mkzenboot.c |
59 | $(SILENT)$(CC) $(CFLAGS) -DSTANDALONE -c -o $@ $+ | 56 | $(SILENT)$(CC) $(CFLAGS) -DSTANDALONE -c -o $@ $+ |
60 | 57 | ||
diff --git a/tools/configure b/tools/configure index 6a9415e7a3..c79d69570c 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1608,7 +1608,7 @@ fi | |||
1608 | appextra="recorder:gui" | 1608 | appextra="recorder:gui" |
1609 | plugins="yes" | 1609 | plugins="yes" |
1610 | swcodec="yes" | 1610 | swcodec="yes" |
1611 | toolset="$gigabeatbitmaptools mknkboot" | 1611 | toolset="$gigabeatbitmaptools" |
1612 | boottool="$rootdir/tools/scramble -gigabeats" | 1612 | boottool="$rootdir/tools/scramble -gigabeats" |
1613 | bootoutput="nk.bin" | 1613 | bootoutput="nk.bin" |
1614 | # architecture, manufacturer and model for the target-tree build | 1614 | # architecture, manufacturer and model for the target-tree build |
diff --git a/utils/MTP/beastpatcher/Makefile b/utils/MTP/beastpatcher/Makefile index 571274034b..bb908532c2 100644 --- a/utils/MTP/beastpatcher/Makefile +++ b/utils/MTP/beastpatcher/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | CFLAGS=-Wall -W -DWITH_BOOTOBJS -DBEASTPATCHER -I../../../tools | 1 | CFLAGS=-Wall -W -DWITH_BOOTOBJS -I../../../tools |
2 | 2 | ||
3 | ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) | 3 | ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) |
4 | OUTPUT=beastpatcher.exe | 4 | OUTPUT=beastpatcher.exe |
@@ -30,17 +30,17 @@ CC = $(CROSS)gcc | |||
30 | 30 | ||
31 | all: $(OUTPUT) | 31 | all: $(OUTPUT) |
32 | 32 | ||
33 | SOURCES = beastpatcher.c bootimg.c ../../../tools/mknkboot.c main.c | 33 | SOURCES = beastpatcher.c bootimg.c mknkboot.c main.c |
34 | HEADERS = beastpatcher.h mtp_common.h bootimg.h ../../../tools/mknkboot.h | 34 | HEADERS = beastpatcher.h mtp_common.h bootimg.h mknkboot.h |
35 | MTPSRCS_W32 = mtp_win32.c | 35 | MTPSRCS_W32 = mtp_win32.c |
36 | MTPSRCS_MTP = mtp_libmtp.c | 36 | MTPSRCS_MTP = mtp_libmtp.c |
37 | 37 | ||
38 | beastpatcher: $(SOURCES) $(HEADERS) $(MTPSRCS_MTP) | 38 | beastpatcher: $(SOURCES) $(HEADERS) $(MTPSRCS_MTP) |
39 | gcc $(CFLAGS) -o beastpatcher $(SOURCES) $(MTPSRCS_MTP) $(LIBS) | 39 | gcc $(CFLAGS) -DBEASTPATCHER -o beastpatcher $(SOURCES) $(MTPSRCS_MTP) $(LIBS) |
40 | strip beastpatcher | 40 | strip beastpatcher |
41 | 41 | ||
42 | beastpatcher.exe: $(SOURCES) $(HEADERS) $(MTPSRCS_W32) $(WINLIBS) | 42 | beastpatcher.exe: $(SOURCES) $(HEADERS) $(MTPSRCS_W32) $(WINLIBS) |
43 | $(CC) $(CFLAGS) -o beastpatcher.exe $(SOURCES) $(MTPSRCS_W32) $(WINLIBS) | 43 | $(CC) $(CFLAGS) -DBEASTPATCHER -o beastpatcher.exe $(SOURCES) $(MTPSRCS_W32) $(WINLIBS) |
44 | $(CROSS)strip beastpatcher.exe | 44 | $(CROSS)strip beastpatcher.exe |
45 | 45 | ||
46 | beastpatcher-mac: beastpatcher-i386 beastpatcher-ppc | 46 | beastpatcher-mac: beastpatcher-i386 beastpatcher-ppc |
@@ -60,5 +60,7 @@ bin2c: ../../../rbutil/tools/bin2c.c | |||
60 | bootimg.c: bootloader.bin bin2c | 60 | bootimg.c: bootloader.bin bin2c |
61 | ./bin2c bootloader.bin bootimg | 61 | ./bin2c bootloader.bin bootimg |
62 | 62 | ||
63 | mknkboot: mknkboot.c | ||
64 | $(SILENT)$(NATIVECC) $(CFLAGS) $+ -o $@ | ||
63 | clean: | 65 | clean: |
64 | rm -f beastpatcher.exe beastpatcher-mac beastpatcher-i386 beastpatcher-ppc beastpatcher bin2c bootimg.c bootimg.h *~ | 66 | rm -f beastpatcher.exe beastpatcher-mac beastpatcher-i386 beastpatcher-ppc beastpatcher bin2c bootimg.c bootimg.h mknkboot *~ |
diff --git a/tools/mknkboot.c b/utils/MTP/beastpatcher/mknkboot.c index 6ac26428bc..6ac26428bc 100644 --- a/tools/mknkboot.c +++ b/utils/MTP/beastpatcher/mknkboot.c | |||
diff --git a/tools/mknkboot.h b/utils/MTP/beastpatcher/mknkboot.h index 0373421a17..0373421a17 100644 --- a/tools/mknkboot.h +++ b/utils/MTP/beastpatcher/mknkboot.h | |||