diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-02-18 13:47:17 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-02-18 13:47:17 +0000 |
commit | cdde25b597eb4047e9db27bb8bbcf938e4a43cfe (patch) | |
tree | d25f47817cc8515228c8ea0eb33ab71bfc2159d4 /firmware | |
parent | f436476f9f0eeae4640197866ea5b5fa068df7e9 (diff) | |
download | rockbox-cdde25b597eb4047e9db27bb8bbcf938e4a43cfe.tar.gz rockbox-cdde25b597eb4047e9db27bb8bbcf938e4a43cfe.zip |
Unified build system to use SOURCES for sim builds too, a single Makefile-look
made by configure and various related adjustments. This has not yet been tested
on cygwin.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6001 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/Makefile | 3 | ||||
-rw-r--r-- | firmware/SOURCES | 48 | ||||
-rw-r--r-- | firmware/common/timefuncs.c | 1 | ||||
-rw-r--r-- | firmware/debug.c | 1 | ||||
-rw-r--r-- | firmware/include/dir.h | 4 | ||||
-rw-r--r-- | firmware/include/stdio.h | 9 | ||||
-rw-r--r-- | firmware/include/time.h | 11 | ||||
-rw-r--r-- | firmware/mpeg.c | 7 |
8 files changed, 60 insertions, 24 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 966d9e048d..618a7703ac 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
@@ -11,7 +11,7 @@ INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers | |||
11 | 11 | ||
12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} |
13 | 13 | ||
14 | SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - ) | 14 | SRC := $(shell cat SOURCES | gcc -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - ) |
15 | SOURCES = $(SRC) | 15 | SOURCES = $(SRC) |
16 | OBJS2 := $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) $(OBJDIR)/sysfont.o | 16 | OBJS2 := $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) $(OBJDIR)/sysfont.o |
17 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | 17 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) |
@@ -29,6 +29,7 @@ $(TOOLSDIR)/convbdf: | |||
29 | $(OUTPUT): $(OBJS) $(DEPFILE) | 29 | $(OUTPUT): $(OBJS) $(DEPFILE) |
30 | @echo "AR $@" | 30 | @echo "AR $@" |
31 | @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 | 31 | @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 |
32 | @$(RANLIB) $@ | ||
32 | 33 | ||
33 | include $(TOOLSDIR)/make.inc | 34 | include $(TOOLSDIR)/make.inc |
34 | 35 | ||
diff --git a/firmware/SOURCES b/firmware/SOURCES index 535b221127..a5e95e7152 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -1,11 +1,15 @@ | |||
1 | #ifndef SIMULATOR | ||
1 | backlight.c | 2 | backlight.c |
3 | #endif | ||
2 | buffer.c | 4 | buffer.c |
3 | common/atoi.c | 5 | common/atoi.c |
4 | common/ctype.c | 6 | common/ctype.c |
7 | #ifndef SIMULATOR | ||
5 | common/dir.c | 8 | common/dir.c |
9 | common/file.c | ||
10 | #endif | ||
6 | common/disk.c | 11 | common/disk.c |
7 | common/errno.c | 12 | common/errno.c |
8 | common/file.c | ||
9 | common/memcmp.c | 13 | common/memcmp.c |
10 | common/qsort.c | 14 | common/qsort.c |
11 | common/random.c | 15 | common/random.c |
@@ -16,7 +20,7 @@ common/strcat.c | |||
16 | common/strchr.c | 20 | common/strchr.c |
17 | common/strcmp.c | 21 | common/strcmp.c |
18 | common/strcpy.c | 22 | common/strcpy.c |
19 | #if CONFIG_CPU == SH7034 | 23 | #if (CONFIG_CPU == SH7034) && !defined(SIMULATOR) |
20 | common/strlen_a.S | 24 | common/strlen_a.S |
21 | #else | 25 | #else |
22 | common/strlen.c | 26 | common/strlen.c |
@@ -33,7 +37,20 @@ common/memset_a.S | |||
33 | common/memcpy.c | 37 | common/memcpy.c |
34 | common/memset.c | 38 | common/memset.c |
35 | #endif | 39 | #endif |
36 | debug.c | 40 | #ifdef HAVE_LCD_CHARCELLS |
41 | drivers/lcd-player-charset.c | ||
42 | drivers/lcd-player.c | ||
43 | #endif | ||
44 | #ifdef HAVE_LCD_BITMAP | ||
45 | #if CONFIG_LCD == LCD_S1D15E06 | ||
46 | drivers/lcd-h100.c | ||
47 | #else | ||
48 | drivers/lcd-recorder.c | ||
49 | #endif | ||
50 | #endif | ||
51 | drivers/power.c | ||
52 | drivers/led.c | ||
53 | #ifndef SIMULATOR | ||
37 | drivers/adc.c | 54 | drivers/adc.c |
38 | #ifdef HAVE_MMC | 55 | #ifdef HAVE_MMC |
39 | drivers/ata_mmc.c | 56 | drivers/ata_mmc.c |
@@ -54,42 +71,35 @@ tuner_philips.c | |||
54 | #endif | 71 | #endif |
55 | #endif | 72 | #endif |
56 | drivers/i2c.c | 73 | drivers/i2c.c |
57 | #ifdef HAVE_LCD_CHARCELLS | ||
58 | drivers/lcd-player-charset.c | ||
59 | drivers/lcd-player.c | ||
60 | #endif | ||
61 | #ifdef HAVE_LCD_BITMAP | ||
62 | #if CONFIG_LCD == LCD_S1D15E06 | ||
63 | drivers/lcd-h100.c | ||
64 | #else | ||
65 | drivers/lcd-recorder.c | ||
66 | #endif | ||
67 | #endif | ||
68 | drivers/led.c | ||
69 | #if CONFIG_HWCODEC != MASNONE | 74 | #if CONFIG_HWCODEC != MASNONE |
70 | drivers/mas.c | 75 | drivers/mas.c |
71 | #endif | 76 | #endif |
72 | drivers/power.c | ||
73 | #ifdef HAVE_RTC | 77 | #ifdef HAVE_RTC |
74 | drivers/rtc.c | 78 | drivers/rtc.c |
75 | #endif | 79 | #endif |
76 | drivers/serial.c | 80 | drivers/serial.c |
81 | #endif /* !SIMULATOR */ | ||
77 | #ifdef HAVE_LCD_BITMAP | 82 | #ifdef HAVE_LCD_BITMAP |
78 | font.c | 83 | font.c |
79 | #endif | 84 | #endif |
80 | hwcompat.c | 85 | hwcompat.c |
81 | id3.c | 86 | id3.c |
87 | #ifndef SIMULATOR | ||
82 | kernel.c | 88 | kernel.c |
89 | rolo.c | ||
90 | thread.c | ||
91 | crt0.S | ||
92 | #endif | ||
83 | mp3_playback.c | 93 | mp3_playback.c |
84 | mp3data.c | 94 | mp3data.c |
85 | mpeg.c | 95 | mpeg.c |
96 | #ifndef WIN32 /* the win32 sim has its own versin of these: */ | ||
86 | panic.c | 97 | panic.c |
98 | debug.c | ||
99 | #endif | ||
87 | powermgmt.c | 100 | powermgmt.c |
88 | rolo.c | ||
89 | system.c | 101 | system.c |
90 | thread.c | ||
91 | usb.c | 102 | usb.c |
92 | crt0.S | ||
93 | #if CONFIG_CPU == SH7034 | 103 | #if CONFIG_CPU == SH7034 |
94 | bitswap.S | 104 | bitswap.S |
95 | descramble.S | 105 | descramble.S |
diff --git a/firmware/common/timefuncs.c b/firmware/common/timefuncs.c index 1e95733399..1a256cc05e 100644 --- a/firmware/common/timefuncs.c +++ b/firmware/common/timefuncs.c | |||
@@ -17,6 +17,7 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include <stdio.h> /* get NULL */ | ||
20 | #include "config.h" | 21 | #include "config.h" |
21 | 22 | ||
22 | #include "rtc.h" | 23 | #include "rtc.h" |
diff --git a/firmware/debug.c b/firmware/debug.c index 5cc032b1b3..0989e80b17 100644 --- a/firmware/debug.c +++ b/firmware/debug.c | |||
@@ -222,6 +222,7 @@ void debugf(const char *fmt, ...) | |||
222 | void debug_init(void) | 222 | void debug_init(void) |
223 | { | 223 | { |
224 | } | 224 | } |
225 | extern void *stderr; | ||
225 | 226 | ||
226 | void debugf(const char *fmt, ...) | 227 | void debugf(const char *fmt, ...) |
227 | { | 228 | { |
diff --git a/firmware/include/dir.h b/firmware/include/dir.h index 8dcbb8e900..12ec724692 100644 --- a/firmware/include/dir.h +++ b/firmware/include/dir.h | |||
@@ -22,8 +22,6 @@ | |||
22 | #include <stdbool.h> | 22 | #include <stdbool.h> |
23 | #include <file.h> | 23 | #include <file.h> |
24 | 24 | ||
25 | #ifndef DIRENT_DEFINED | ||
26 | |||
27 | #define ATTR_READ_ONLY 0x01 | 25 | #define ATTR_READ_ONLY 0x01 |
28 | #define ATTR_HIDDEN 0x02 | 26 | #define ATTR_HIDDEN 0x02 |
29 | #define ATTR_SYSTEM 0x04 | 27 | #define ATTR_SYSTEM 0x04 |
@@ -32,6 +30,8 @@ | |||
32 | #define ATTR_ARCHIVE 0x20 | 30 | #define ATTR_ARCHIVE 0x20 |
33 | #define ATTR_VOLUME 0x40 /* this is a volume, not a real directory */ | 31 | #define ATTR_VOLUME 0x40 /* this is a volume, not a real directory */ |
34 | 32 | ||
33 | #ifndef DIRENT_DEFINED | ||
34 | |||
35 | struct dirent { | 35 | struct dirent { |
36 | unsigned char d_name[MAX_PATH]; | 36 | unsigned char d_name[MAX_PATH]; |
37 | int attribute; | 37 | int attribute; |
diff --git a/firmware/include/stdio.h b/firmware/include/stdio.h index b98f01c729..968bd59aab 100644 --- a/firmware/include/stdio.h +++ b/firmware/include/stdio.h | |||
@@ -36,4 +36,13 @@ | |||
36 | int snprintf (char *buf, size_t size, const char *fmt, ...); | 36 | int snprintf (char *buf, size_t size, const char *fmt, ...); |
37 | int vsnprintf (char *buf, int size, const char *fmt, __VALIST ap); | 37 | int vsnprintf (char *buf, int size, const char *fmt, __VALIST ap); |
38 | 38 | ||
39 | #ifdef SIMULATOR | ||
40 | typedef void FILE; | ||
41 | int vfprintf(FILE *stream, const char *format, __VALIST ap); | ||
42 | #ifdef WIN32 | ||
43 | #define FILENAME_MAX 260 /* ugly hard-coded value of a limit that is set | ||
44 | in file.h */ | ||
45 | #endif | ||
46 | #endif | ||
47 | |||
39 | #endif /* _STDIO_H_ */ | 48 | #endif /* _STDIO_H_ */ |
diff --git a/firmware/include/time.h b/firmware/include/time.h index 5213468662..267face71b 100644 --- a/firmware/include/time.h +++ b/firmware/include/time.h | |||
@@ -20,5 +20,16 @@ struct tm | |||
20 | int tm_isdst; | 20 | int tm_isdst; |
21 | }; | 21 | }; |
22 | 22 | ||
23 | #if defined(SIMULATOR) && !defined(_TIME_T_DEFINED) | ||
24 | /* for non-win32 simulators */ | ||
25 | typedef long time_t; | ||
26 | |||
27 | /* this define below is used by the mingw headers to prevent duplicate | ||
28 | typedefs */ | ||
29 | #define _TIME_T_DEFINED | ||
30 | time_t time(time_t *t); | ||
31 | |||
32 | #endif | ||
33 | |||
23 | #endif /* _TIME_H_ */ | 34 | #endif /* _TIME_H_ */ |
24 | 35 | ||
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index e9ddb18556..8673da9980 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -2485,9 +2485,12 @@ unsigned long mpeg_num_recorded_bytes(void) | |||
2485 | return 0; | 2485 | return 0; |
2486 | } | 2486 | } |
2487 | 2487 | ||
2488 | #elif CONFIG_HWCODEC == MASNONE | 2488 | #elif (CONFIG_HWCODEC == MASNONE) || defined(SIMULATOR) |
2489 | 2489 | ||
2490 | /* dummies coming up */ | 2490 | /* dummies coming up |
2491 | |||
2492 | NOTE: when we implment these functions for real for software coded targets, | ||
2493 | these dummies shall remain for the simulator */ | ||
2491 | 2494 | ||
2492 | void bitswap(unsigned char *data, int length) | 2495 | void bitswap(unsigned char *data, int length) |
2493 | { | 2496 | { |