diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-12-03 09:44:21 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-12-03 09:44:21 +0000 |
commit | 7de4f64bb6f1630c1b62767f69b7ce00936f5fa1 (patch) | |
tree | cdbc7fad4f6da36b48d62ff8171d808edf03484b | |
parent | fd5f16c070d5afd6b01a9ff0cdc4ccc1ab01c76a (diff) | |
download | rockbox-7de4f64bb6f1630c1b62767f69b7ce00936f5fa1.tar.gz rockbox-7de4f64bb6f1630c1b62767f69b7ce00936f5fa1.zip |
Rockbox Utility: build chinachippatcher as library.
Update the chinachip Makefile based on the mkamsboot one, build and link as
library for Rockbox Utility.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31117 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/chinachippatcher/Makefile | 98 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pri | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 7 |
3 files changed, 98 insertions, 9 deletions
diff --git a/rbutil/chinachippatcher/Makefile b/rbutil/chinachippatcher/Makefile index fbdb30f4b8..af1e32ab4c 100644 --- a/rbutil/chinachippatcher/Makefile +++ b/rbutil/chinachippatcher/Makefile | |||
@@ -1,10 +1,96 @@ | |||
1 | CFLAGS=-g -Wall -DSTANDALONE | 1 | # __________ __ ___. |
2 | CC=gcc | 2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ |
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
3 | 7 | ||
4 | all: chinachip | 8 | #change for releases |
9 | TARGET_DIR ?= $(shell pwd)/ | ||
10 | CFLAGS=-Wall -g | ||
5 | 11 | ||
6 | chinachip: chinachip.c main.c | 12 | ifndef V |
7 | $(CC) $(CFLAGS) -o $@ $^ | 13 | SILENT = @ |
14 | endif | ||
15 | |||
16 | ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) | ||
17 | OUTPUT=chinachip.exe | ||
18 | CFLAGS+=-mno-cygwin | ||
19 | else | ||
20 | ifeq ($(findstring MINGW,$(shell uname)),MINGW) | ||
21 | OUTPUT=chinachip.exe | ||
22 | else | ||
23 | ifeq ($(findstring mingw,$(CC)),mingw) | ||
24 | OUTPUT=chinachip.exe | ||
25 | else | ||
26 | OUTPUT=chinachip | ||
27 | endif | ||
28 | endif | ||
29 | endif | ||
30 | |||
31 | ifdef RBARCH | ||
32 | CFLAGS += -arch $(RBARCH) | ||
33 | OBJDIR = $(TARGET_DIR)build/$(RBARCH)/ | ||
34 | else | ||
35 | OBJDIR = $(TARGET_DIR)build/ | ||
36 | endif | ||
37 | |||
38 | |||
39 | all: $(OUTPUT) | ||
40 | |||
41 | # inputs | ||
42 | LIBSOURCES := chinachip.c | ||
43 | SOURCES := $(LIBSOURCES) main.c | ||
44 | OBJS := $(patsubst %.c,%.o,$(addprefix $(OBJDIR),$(SOURCES))) | ||
45 | LIBOBJS := $(patsubst %.c,%.o,$(addprefix $(OBJDIR),$(LIBSOURCES))) | ||
46 | EXTRADEPS := | ||
47 | |||
48 | $(OBJDIR)%.o: %.c | ||
49 | @echo CC $< | ||
50 | $(SILENT)mkdir -p $(dir $@) | ||
51 | $(SILENT)$(CC) $(CFLAGS) -c -o $@ $< | ||
52 | |||
53 | libchinachip$(RBARCH).a: $(TARGET_DIR)libchinachip$(RBARCH).a | ||
54 | |||
55 | $(TARGET_DIR)libchinachip$(RBARCH).a: $(LIBOBJS) | ||
56 | @echo AR $(notdir $@) | ||
57 | $(SILENT)$(AR) rucs $@ $^ | ||
58 | |||
59 | # building the standalone executable | ||
60 | $(OUTPUT): $(OBJS) $(EXTRADEPS) | ||
61 | @echo LD $@ | ||
62 | $(SILENT)$(CC) $(CFLAGS) -o $(OUTPUT) $(OBJS) $(EXTRADEPS) | ||
63 | |||
64 | # some trickery to build ppc and i386 from a single call | ||
65 | ifeq ($(RBARCH),) | ||
66 | $(TARGET_DIR)libchinachipi386.a: | ||
67 | make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libchinachipi386.a | ||
68 | |||
69 | $(TARGET_DIR)libchinachipppc.a: | ||
70 | make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libchinachipppc.a | ||
71 | endif | ||
72 | |||
73 | libchinachip-universal: $(TARGET_DIR)libchinachipi386.a $(TARGET_DIR)libchinachipppc.a | ||
74 | @echo lipo $(TARGET_DIR)libchinachip.a | ||
75 | $(SILENT) rm -f $(TARGET_DIR)libchinachip.a | ||
76 | $(SILENT)lipo -create $(TARGET_DIR)libchinachipppc.a $(TARGET_DIR)libchinachipi386.a -output $(TARGET_DIR)libchinachip.a | ||
8 | 77 | ||
9 | clean: | 78 | clean: |
10 | rm -f chinachip | 79 | rm -f $(OBJS) $(OUTPUT) libchinachip.o $(TARGET_DIR)libchinachip*.a chinachip.dmg |
80 | rm -rf chinachip-* i386 ppc $(OBJDIR) | ||
81 | |||
82 | chinachip-i386: | ||
83 | $(MAKE) RBARCH=i386 | ||
84 | mv chinachip chinachip-i386 | ||
85 | |||
86 | chinachip-ppc: | ||
87 | $(MAKE) RBARCH=ppc | ||
88 | mv chinachip chinachip-ppc | ||
89 | |||
90 | chinachip-mac: chinachip-i386 chinachip-ppc | ||
91 | $(SILENT)lipo -create chinachip-ppc chinachip-i386 -output chinachip-mac | ||
92 | |||
93 | chinachip.dmg: chinachip-mac | ||
94 | mkdir -p chinachip-dmg | ||
95 | cp -p chinachip-mac chinachip-dmg | ||
96 | hdiutil create -srcfolder chinachip-dmg chinachip.dmg | ||
diff --git a/rbutil/rbutilqt/rbutilqt.pri b/rbutil/rbutilqt/rbutilqt.pri index 0f887d7070..a0f4d550aa 100644 --- a/rbutil/rbutilqt/rbutilqt.pri +++ b/rbutil/rbutilqt/rbutilqt.pri | |||
@@ -30,7 +30,6 @@ SOURCES += \ | |||
30 | base/autodetection.cpp \ | 30 | base/autodetection.cpp \ |
31 | ../ipodpatcher/ipodpatcher.c \ | 31 | ../ipodpatcher/ipodpatcher.c \ |
32 | ../sansapatcher/sansapatcher.c \ | 32 | ../sansapatcher/sansapatcher.c \ |
33 | ../chinachippatcher/chinachip.c \ | ||
34 | themesinstallwindow.cpp \ | 33 | themesinstallwindow.cpp \ |
35 | base/uninstall.cpp \ | 34 | base/uninstall.cpp \ |
36 | uninstallwindow.cpp \ | 35 | uninstallwindow.cpp \ |
@@ -94,7 +93,6 @@ HEADERS += \ | |||
94 | ../ipodpatcher/parttypes.h \ | 93 | ../ipodpatcher/parttypes.h \ |
95 | ../sansapatcher/sansapatcher.h \ | 94 | ../sansapatcher/sansapatcher.h \ |
96 | ../sansapatcher/sansaio.h \ | 95 | ../sansapatcher/sansaio.h \ |
97 | ../chinachippatcher/chinachip.h \ | ||
98 | irivertools/h100sums.h \ | 96 | irivertools/h100sums.h \ |
99 | irivertools/h120sums.h \ | 97 | irivertools/h120sums.h \ |
100 | irivertools/h300sums.h \ | 98 | irivertools/h300sums.h \ |
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index fc547525aa..e8e2ac9fe0 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -95,9 +95,14 @@ libmkmpioboot.commands = @$(MAKE) -s \ | |||
95 | APPVERSION=\"rbutil\" \ | 95 | APPVERSION=\"rbutil\" \ |
96 | libmkmpioboot$$RBLIBPOSTFIX \ | 96 | libmkmpioboot$$RBLIBPOSTFIX \ |
97 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" | 97 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" |
98 | libchinachip.commands = @$(MAKE) -s \ | ||
99 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/chinachippatcher \ | ||
100 | APPVERSION=\"rbutil\" \ | ||
101 | libchinachip$$RBLIBPOSTFIX \ | ||
102 | CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\" | ||
98 | # Note: order is important for RBLIBS! The libs are appended to the linker | 103 | # Note: order is important for RBLIBS! The libs are appended to the linker |
99 | # flags in this order, put libucl at the end. | 104 | # flags in this order, put libucl at the end. |
100 | RBLIBS = librbspeex libmkamsboot libmktccboot libmkmpioboot libucl | 105 | RBLIBS = librbspeex libmkamsboot libmktccboot libmkmpioboot libchinachip libucl |
101 | QMAKE_EXTRA_TARGETS += $$RBLIBS | 106 | QMAKE_EXTRA_TARGETS += $$RBLIBS |
102 | PRE_TARGETDEPS += $$RBLIBS | 107 | PRE_TARGETDEPS += $$RBLIBS |
103 | 108 | ||