summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2013-04-01 21:30:26 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2013-04-04 22:42:22 +0200
commitb3ef8c8e5bb85ea5186156b75fc009f1c6831cb6 (patch)
treec796fbb5369457bccf7c6d1f375122bf98ac563a
parent86d46b626b347463c688206dc49ec3a716a444c3 (diff)
downloadrockbox-b3ef8c8e5bb85ea5186156b75fc009f1c6831cb6.tar.gz
rockbox-b3ef8c8e5bb85ea5186156b75fc009f1c6831cb6.zip
Put resource object into object folder.
Use correct path for windres output. Fixes windres running even if no changes are present. Change-Id: I2841113bab9b38f2a03ba2f168b3d8bdb5c102df
-rw-r--r--rbutil/ipodpatcher/Makefile5
-rw-r--r--rbutil/sansapatcher/Makefile3
2 files changed, 5 insertions, 3 deletions
diff --git a/rbutil/ipodpatcher/Makefile b/rbutil/ipodpatcher/Makefile
index d2fec80b39..79fe4c7c03 100644
--- a/rbutil/ipodpatcher/Makefile
+++ b/rbutil/ipodpatcher/Makefile
@@ -36,13 +36,14 @@ LIBSOURCES = ipodpatcher.c fat32format.c arc4.c \
36 ipodio-posix.c ipodio-win32-scsi.c ipodio-win32.c 36 ipodio-posix.c ipodio-win32-scsi.c ipodio-win32.c
37SOURCES = main.c $(BOOTSRC) $(LIBSOURCES) 37SOURCES = main.c $(BOOTSRC) $(LIBSOURCES)
38ipodpatcher: SOURCES+= ipodio-posix.c 38ipodpatcher: SOURCES+= ipodio-posix.c
39ipodpatcher.exe: SOURCES+= ipodpatcher-rc.o
40 39
41OUTPUT = ipodpatcher 40OUTPUT = ipodpatcher
42include ../libtools.make 41include ../libtools.make
43 42
43ipodpatcher.exe: $(OBJDIR)ipodpatcher-rc.o
44$(OBJDIR)ipodpatcher-rc.o: ipodpatcher.rc ipodpatcher.manifest 44$(OBJDIR)ipodpatcher-rc.o: ipodpatcher.rc ipodpatcher.manifest
45 $(CROSS)$(WINDRES) -i ipodpatcher.rc -o ipodpatcher-rc.o 45 @echo WINDRES $(notdir $<)
46 $(SILENT)$(CROSS)$(WINDRES) -i $< -o $@
46 47
47%.c: bootloader-%.ipod $(BIN2C) 48%.c: bootloader-%.ipod $(BIN2C)
48 @echo BIN2C $< 49 @echo BIN2C $<
diff --git a/rbutil/sansapatcher/Makefile b/rbutil/sansapatcher/Makefile
index 4e86d6b06f..08af2bb6c8 100644
--- a/rbutil/sansapatcher/Makefile
+++ b/rbutil/sansapatcher/Makefile
@@ -39,7 +39,8 @@ endif
39 39
40$(OBJDIR)main.o: $(BOOTSRC) 40$(OBJDIR)main.o: $(BOOTSRC)
41$(OBJDIR)sansapatcher-rc.o: sansapatcher.rc sansapatcher.manifest 41$(OBJDIR)sansapatcher-rc.o: sansapatcher.rc sansapatcher.manifest
42 $(CROSS)$(WINDRES) -i sansapatcher.rc -o sansapatcher-rc.o 42 @echo WINDRES $(notdir $<)
43 $(SILENT)$(CROSS)$(WINDRES) -i sansapatcher.rc -o $@
43 44
44bootimg_c200.c: firmware.mi4 $(BIN2C) 45bootimg_c200.c: firmware.mi4 $(BIN2C)
45 @echo BIN2C $< 46 @echo BIN2C $<