diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-10-27 21:15:21 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-10-27 21:15:21 +0000 |
| commit | b82963bd9dd99c705625aceadb7118a428fc4ed2 (patch) | |
| tree | 5cc54c84c908933bb79614c502a3a61f863a2650 | |
| parent | 806bc7947b0b03f3b2d11b38d17066d5e1e890d3 (diff) | |
| download | rockbox-b82963bd9dd99c705625aceadb7118a428fc4ed2.zip rockbox-b82963bd9dd99c705625aceadb7118a428fc4ed2.tar.gz rockbox-b82963bd9dd99c705625aceadb7118a428fc4ed2.tar.bz2 rockbox-b82963bd9dd99c705625aceadb7118a428fc4ed2.tar.xz | |
Move mknkboot.[ch] to beastpatcher folder.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23372 a1c6a512-1295-4272-9138-f99709370657
| -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 b7f5c86..71fb6bf 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -13,10 +13,10 @@ LDFLAGS := -g CLEANALL := scramble descramble iriver sh2d bmp2rb rdf2binary convbdf \ generate_rocklatin mkboot ipod_fw codepages uclpack mi4 gigabeat \ - lngdump telechips gigabeats creative hmac-sha1 mktccboot mknkboot rbspeexenc \ + lngdump telechips gigabeats creative hmac-sha1 mktccboot rbspeexenc \ mkzenboot mk500boot -all: scramble descramble sh2d rdf2binary mkboot mktccboot mknkboot mkzenboot \ +all: scramble descramble sh2d rdf2binary mkboot mktccboot mkzenboot \ convbdf codepages uclpack rbspeexenc voicefont mk500boot 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 mk500boot: mk500boot.c mr500.c $(SILENT)$(CC) $(CFLAGS) $+ -o $@ -mknkboot: mknkboot.c - $(SILENT)$(CC) $(CFLAGS) $+ -o $@ - mkzenboot.o: mkzenboot.c $(SILENT)$(CC) $(CFLAGS) -DSTANDALONE -c -o $@ $+ diff --git a/tools/configure b/tools/configure index 6a9415e..c79d695 100755 --- a/tools/configure +++ b/tools/configure @@ -1608,7 +1608,7 @@ fi appextra="recorder:gui" plugins="yes" swcodec="yes" - toolset="$gigabeatbitmaptools mknkboot" + toolset="$gigabeatbitmaptools" boottool="$rootdir/tools/scramble -gigabeats" bootoutput="nk.bin" # architecture, manufacturer and model for the target-tree build diff --git a/utils/MTP/beastpatcher/Makefile b/utils/MTP/beastpatcher/Makefile index 5712740..bb90853 100644 --- a/utils/MTP/beastpatcher/Makefile +++ b/utils/MTP/beastpatcher/Makefile @@ -1,4 +1,4 @@ -CFLAGS=-Wall -W -DWITH_BOOTOBJS -DBEASTPATCHER -I../../../tools +CFLAGS=-Wall -W -DWITH_BOOTOBJS -I../../../tools ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) OUTPUT=beastpatcher.exe @@ -30,17 +30,17 @@ CC = $(CROSS)gcc all: $(OUTPUT) -SOURCES = beastpatcher.c bootimg.c ../../../tools/mknkboot.c main.c -HEADERS = beastpatcher.h mtp_common.h bootimg.h ../../../tools/mknkboot.h +SOURCES = beastpatcher.c bootimg.c mknkboot.c main.c +HEADERS = beastpatcher.h mtp_common.h bootimg.h mknkboot.h MTPSRCS_W32 = mtp_win32.c MTPSRCS_MTP = mtp_libmtp.c beastpatcher: $(SOURCES) $(HEADERS) $(MTPSRCS_MTP) - gcc $(CFLAGS) -o beastpatcher $(SOURCES) $(MTPSRCS_MTP) $(LIBS) + gcc $(CFLAGS) -DBEASTPATCHER -o beastpatcher $(SOURCES) $(MTPSRCS_MTP) $(LIBS) strip beastpatcher beastpatcher.exe: $(SOURCES) $(HEADERS) $(MTPSRCS_W32) $(WINLIBS) - $(CC) $(CFLAGS) -o beastpatcher.exe $(SOURCES) $(MTPSRCS_W32) $(WINLIBS) + $(CC) $(CFLAGS) -DBEASTPATCHER -o beastpatcher.exe $(SOURCES) $(MTPSRCS_W32) $(WINLIBS) $(CROSS)strip beastpatcher.exe beastpatcher-mac: beastpatcher-i386 beastpatcher-ppc @@ -60,5 +60,7 @@ bin2c: ../../../rbutil/tools/bin2c.c bootimg.c: bootloader.bin bin2c ./bin2c bootloader.bin bootimg +mknkboot: mknkboot.c + $(SILENT)$(NATIVECC) $(CFLAGS) $+ -o $@ clean: - rm -f beastpatcher.exe beastpatcher-mac beastpatcher-i386 beastpatcher-ppc beastpatcher bin2c bootimg.c bootimg.h *~ + 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 6ac2642..6ac2642 100644 --- a/tools/mknkboot.c +++ b/utils/MTP/beastpatcher/mknkboot.c diff --git a/tools/mknkboot.h b/utils/MTP/beastpatcher/mknkboot.h index 0373421..0373421 100644 --- a/tools/mknkboot.h +++ b/utils/MTP/beastpatcher/mknkboot.h |