diff options
author | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 11:27:31 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 11:27:31 +0000 |
commit | c6b3d38a156dd624760a8eb1bb374affd43b4f2a (patch) | |
tree | 493eba929e2396d86cf4f077709aa09fe172cd35 /uisimulator | |
parent | f66c30346783a400a029bedcd60ab67c81c34a07 (diff) | |
download | rockbox-c6b3d38a156dd624760a8eb1bb374affd43b4f2a.tar.gz rockbox-c6b3d38a156dd624760a8eb1bb374affd43b4f2a.zip |
New makefile solution: A single invocation of 'make' to build the entire tree. Fully controlled dependencies give faster and more correct recompiles.
Many #include lines adjusted to conform to the new standards.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19146 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/sdl/uisdl.h | 2 | ||||
-rw-r--r-- | uisimulator/uisimulator.make | 38 |
2 files changed, 39 insertions, 1 deletions
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h index 5b0f944d3f..0a97df56fa 100644 --- a/uisimulator/sdl/uisdl.h +++ b/uisimulator/sdl/uisdl.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #define __UISDL_H__ | 23 | #define __UISDL_H__ |
24 | 24 | ||
25 | #include <stdbool.h> | 25 | #include <stdbool.h> |
26 | #include "SDL.h" | 26 | #include <SDL.h> |
27 | 27 | ||
28 | /* colour definitions are R, G, B */ | 28 | /* colour definitions are R, G, B */ |
29 | 29 | ||
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make new file mode 100644 index 0000000000..a5707bdea6 --- /dev/null +++ b/uisimulator/uisimulator.make | |||
@@ -0,0 +1,38 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id: Makefile 19082 2008-11-10 23:54:24Z zagor $ | ||
8 | # | ||
9 | |||
10 | INCLUDES += -I$(ROOTDIR)/uisimulator/sdl -I$(ROOTDIR)/uisimulator/common \ | ||
11 | |||
12 | SIMINCLUDES += -I$(ROOTDIR)/uisimulator/sdl -I$(ROOTDIR)/uisimulator/common \ | ||
13 | -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR) | ||
14 | |||
15 | SIMFLAGS += $(SIMINCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS) | ||
16 | |||
17 | SIMSRC += $(call preprocess, $(ROOTDIR)/uisimulator/sdl/SOURCES) | ||
18 | SIMSRC += $(call preprocess, $(ROOTDIR)/uisimulator/common/SOURCES) | ||
19 | SIMOBJ = $(call c2obj,$(SIMSRC)) | ||
20 | OTHER_SRC += $(SIMSRC) | ||
21 | |||
22 | SIMLIB = $(BUILDDIR)/uisimulator/libuisimulator.a | ||
23 | UIBMP = $(BUILDDIR)/UI256.bmp | ||
24 | |||
25 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this | ||
26 | |||
27 | $(SIMLIB): $$(SIMOBJ) $(UIBMP) | ||
28 | $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 | ||
29 | |||
30 | $(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB) | ||
31 | $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) | ||
32 | |||
33 | $(BUILDDIR)/uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c | ||
34 | $(SILENT)mkdir -p $(dir $@) | ||
35 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SIMFLAGS) -c $< -o $@ | ||
36 | |||
37 | $(UIBMP): $(ROOTDIR)/uisimulator/sdl/UI-$(MODELNAME).bmp | ||
38 | $(call PRINTS,CP $(@F))cp $< $@ | ||