diff options
author | Björn Stenberg <bjorn@haxx.se> | 2009-01-12 21:56:46 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2009-01-12 21:56:46 +0000 |
commit | 52320b83c0e9fb3c3f6c463f8bd61de35f03b235 (patch) | |
tree | 995a6f7e903f2a142ce64e05b27fa5e189b8544c | |
parent | bbd33a0a7db188e874b11e30e509f32c13200aea (diff) | |
download | rockbox-52320b83c0e9fb3c3f6c463f8bd61de35f03b235.tar.gz rockbox-52320b83c0e9fb3c3f6c463f8bd61de35f03b235.zip |
Added missing dependencies for codeclib and pluginlib. This required renaming some files that have twins in other places.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19756 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/codecs.make | 1 | ||||
-rw-r--r-- | apps/codecs/lib/codeclib_misc.h (renamed from apps/codecs/lib/misc.h) | 0 | ||||
-rw-r--r-- | apps/codecs/lib/mdct2.h | 2 | ||||
-rw-r--r-- | apps/plugins/lib/SOURCES | 4 | ||||
-rw-r--r-- | apps/plugins/lib/bmp_smooth_scale.c | 2 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_bmp.c (renamed from apps/plugins/lib/bmp.c) | 2 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_bmp.h (renamed from apps/plugins/lib/bmp.h) | 0 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_resize.c (renamed from apps/plugins/lib/resize.c) | 0 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_resize.h (renamed from apps/plugins/lib/resize.h) | 0 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 2 | ||||
-rw-r--r-- | apps/plugins/ppmviewer.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockpaint.c | 2 | ||||
-rw-r--r-- | apps/plugins/test_greylib_bitmap_scale.c | 4 | ||||
-rw-r--r-- | apps/plugins/test_resize.c | 2 |
14 files changed, 12 insertions, 11 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index 2ba73af627..8bfa53c1cf 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make | |||
@@ -16,6 +16,7 @@ CODECS := $(subst $(ROOTDIR),$(BUILDDIR),$(CODECS)) | |||
16 | 16 | ||
17 | # the codec helper library | 17 | # the codec helper library |
18 | include $(APPSDIR)/codecs/lib/libcodec.make | 18 | include $(APPSDIR)/codecs/lib/libcodec.make |
19 | OTHER_INC += -I$(APPSDIR)/codecs/lib | ||
19 | 20 | ||
20 | # the codec libraries | 21 | # the codec libraries |
21 | include $(APPSDIR)/codecs/demac/libdemac.make | 22 | include $(APPSDIR)/codecs/demac/libdemac.make |
diff --git a/apps/codecs/lib/misc.h b/apps/codecs/lib/codeclib_misc.h index 5ab78d62e7..5ab78d62e7 100644 --- a/apps/codecs/lib/misc.h +++ b/apps/codecs/lib/codeclib_misc.h | |||
diff --git a/apps/codecs/lib/mdct2.h b/apps/codecs/lib/mdct2.h index b03430b21a..ba0f12972e 100644 --- a/apps/codecs/lib/mdct2.h +++ b/apps/codecs/lib/mdct2.h | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <codecs.h> | 31 | #include <codecs.h> |
32 | #include "asm_arm.h" | 32 | #include "asm_arm.h" |
33 | #include "asm_mcf5249.h" | 33 | #include "asm_mcf5249.h" |
34 | #include "misc.h" | 34 | #include "codeclib_misc.h" |
35 | 35 | ||
36 | #ifndef ICONST_ATTR_TREMOR_WINDOW | 36 | #ifndef ICONST_ATTR_TREMOR_WINDOW |
37 | #define ICONST_ATTR_TREMOR_WINDOW ICONST_ATTR | 37 | #define ICONST_ATTR_TREMOR_WINDOW ICONST_ATTR |
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES index b55fea0620..bb7da12e8b 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES | |||
@@ -9,7 +9,7 @@ rgb_hsv.c | |||
9 | pluginlib for use with greylib overlay output | 9 | pluginlib for use with greylib overlay output |
10 | */ | 10 | */ |
11 | #if LCD_DEPTH == 1 | 11 | #if LCD_DEPTH == 1 |
12 | resize.c | 12 | pluginlib_resize.c |
13 | #endif | 13 | #endif |
14 | grey_core.c | 14 | grey_core.c |
15 | grey_draw.c | 15 | grey_draw.c |
@@ -37,7 +37,7 @@ picture.c | |||
37 | xlcd_core.c | 37 | xlcd_core.c |
38 | xlcd_draw.c | 38 | xlcd_draw.c |
39 | xlcd_scroll.c | 39 | xlcd_scroll.c |
40 | bmp.c | 40 | pluginlib_bmp.c |
41 | #ifdef HAVE_LCD_COLOR | 41 | #ifdef HAVE_LCD_COLOR |
42 | bmp_smooth_scale.c | 42 | bmp_smooth_scale.c |
43 | #endif | 43 | #endif |
diff --git a/apps/plugins/lib/bmp_smooth_scale.c b/apps/plugins/lib/bmp_smooth_scale.c index 860a20e7df..4d5eab00a0 100644 --- a/apps/plugins/lib/bmp_smooth_scale.c +++ b/apps/plugins/lib/bmp_smooth_scale.c | |||
@@ -70,7 +70,7 @@ | |||
70 | * (C) Daniel M. Duley. | 70 | * (C) Daniel M. Duley. |
71 | */ | 71 | */ |
72 | 72 | ||
73 | #include "bmp.h" | 73 | #include "pluginlib_bmp.h" |
74 | #include "lcd.h" | 74 | #include "lcd.h" |
75 | 75 | ||
76 | void smooth_resize_bitmap(struct bitmap *src_bmp, struct bitmap *dest_bmp) | 76 | void smooth_resize_bitmap(struct bitmap *src_bmp, struct bitmap *dest_bmp) |
diff --git a/apps/plugins/lib/bmp.c b/apps/plugins/lib/pluginlib_bmp.c index 1cb24d3ea0..b1dd53b15e 100644 --- a/apps/plugins/lib/bmp.c +++ b/apps/plugins/lib/pluginlib_bmp.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * | 20 | * |
21 | ****************************************************************************/ | 21 | ****************************************************************************/ |
22 | 22 | ||
23 | #include "bmp.h" | 23 | #include "pluginlib_bmp.h" |
24 | 24 | ||
25 | #include "lcd.h" | 25 | #include "lcd.h" |
26 | #include "file.h" | 26 | #include "file.h" |
diff --git a/apps/plugins/lib/bmp.h b/apps/plugins/lib/pluginlib_bmp.h index 0e7a0a4933..0e7a0a4933 100644 --- a/apps/plugins/lib/bmp.h +++ b/apps/plugins/lib/pluginlib_bmp.h | |||
diff --git a/apps/plugins/lib/resize.c b/apps/plugins/lib/pluginlib_resize.c index 28446e75a7..28446e75a7 100644 --- a/apps/plugins/lib/resize.c +++ b/apps/plugins/lib/pluginlib_resize.c | |||
diff --git a/apps/plugins/lib/resize.h b/apps/plugins/lib/pluginlib_resize.h index 46a8977675..46a8977675 100644 --- a/apps/plugins/lib/resize.h +++ b/apps/plugins/lib/pluginlib_resize.h | |||
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 0921c0bce2..c6c399db48 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -32,7 +32,7 @@ $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) | |||
32 | PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds | 32 | PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds |
33 | PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link | 33 | PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link |
34 | 34 | ||
35 | OTHER_INC += -I$(APPSDIR)/plugins | 35 | OTHER_INC += -I$(APPSDIR)/plugins -I$(APPSDIR)/plugins/lib |
36 | 36 | ||
37 | # special compile flags for plugins: | 37 | # special compile flags for plugins: |
38 | PLUGINFLAGS = -I$(APPSDIR)/plugins -DPLUGIN $(CFLAGS) | 38 | PLUGINFLAGS = -I$(APPSDIR)/plugins -DPLUGIN $(CFLAGS) |
diff --git a/apps/plugins/ppmviewer.c b/apps/plugins/ppmviewer.c index 97f085ad6f..6db24ff804 100644 --- a/apps/plugins/ppmviewer.c +++ b/apps/plugins/ppmviewer.c | |||
@@ -20,7 +20,7 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | #include "lib/bmp.h" | 23 | #include "lib/pluginlib_bmp.h" |
24 | 24 | ||
25 | #if defined(HAVE_LCD_COLOR) | 25 | #if defined(HAVE_LCD_COLOR) |
26 | 26 | ||
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index b66324c85b..96ae7c5af5 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -29,7 +29,7 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "plugin.h" | 31 | #include "plugin.h" |
32 | #include "lib/bmp.h" | 32 | #include "lib/pluginlib_bmp.h" |
33 | #include "lib/rgb_hsv.h" | 33 | #include "lib/rgb_hsv.h" |
34 | 34 | ||
35 | PLUGIN_HEADER | 35 | PLUGIN_HEADER |
diff --git a/apps/plugins/test_greylib_bitmap_scale.c b/apps/plugins/test_greylib_bitmap_scale.c index a3de006e05..1e45130318 100644 --- a/apps/plugins/test_greylib_bitmap_scale.c +++ b/apps/plugins/test_greylib_bitmap_scale.c | |||
@@ -21,8 +21,8 @@ | |||
21 | 21 | ||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | #include "lib/grey.h" | 23 | #include "lib/grey.h" |
24 | #include "lib/resize.h" | 24 | #include "lib/pluginlib_resize.h" |
25 | #include "lib/bmp.h" | 25 | #include "lib/pluginlib_bmp.h" |
26 | 26 | ||
27 | #if LCD_DEPTH == 1 | 27 | #if LCD_DEPTH == 1 |
28 | #define BMP_LOAD read_bmp_file | 28 | #define BMP_LOAD read_bmp_file |
diff --git a/apps/plugins/test_resize.c b/apps/plugins/test_resize.c index a608005c10..e98fa80ba5 100644 --- a/apps/plugins/test_resize.c +++ b/apps/plugins/test_resize.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #include "plugin.h" | 27 | #include "plugin.h" |
28 | #include "lib/pluginlib_actions.h" | 28 | #include "lib/pluginlib_actions.h" |
29 | #include "lib/bmp.h" | 29 | #include "lib/pluginlib_bmp.h" |
30 | 30 | ||
31 | PLUGIN_HEADER | 31 | PLUGIN_HEADER |
32 | 32 | ||