diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2013-04-16 17:47:58 -0400 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2013-04-26 00:11:04 +0200 |
| commit | 95e23defb085ee1a846ec2d379368485921d5aee (patch) | |
| tree | 0bdb31f562fef8c7ff5f3f7dba9c54f9c1e84a76 /apps/plugins | |
| parent | 8829e909b4e756bfb2ad9210eec61d0dc55e1731 (diff) | |
| download | rockbox-95e23defb085ee1a846ec2d379368485921d5aee.zip rockbox-95e23defb085ee1a846ec2d379368485921d5aee.tar.gz rockbox-95e23defb085ee1a846ec2d379368485921d5aee.tar.bz2 rockbox-95e23defb085ee1a846ec2d379368485921d5aee.tar.xz | |
Make fixepoint.c as a shared library (libfixedpoint.a).
Change-Id: Icc10d6e85f890c432f191233a4d64e09f00be43d
Reviewed-on: http://gerrit.rockbox.org/456
Reviewed-by: Michael Sevakis <jethead71@rockbox.org>
Tested-by: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/bounce.c | 2 | ||||
| -rw-r--r-- | apps/plugins/bubbles.c | 2 | ||||
| -rw-r--r-- | apps/plugins/clock/clock_draw_analog.c | 2 | ||||
| -rw-r--r-- | apps/plugins/cube.c | 2 | ||||
| -rw-r--r-- | apps/plugins/fft/math.h | 2 | ||||
| -rw-r--r-- | apps/plugins/fire.c | 2 | ||||
| -rw-r--r-- | apps/plugins/lib/SOURCES | 1 | ||||
| -rw-r--r-- | apps/plugins/lib/fixedpoint.c | 1 | ||||
| -rw-r--r-- | apps/plugins/lib/fixedpoint.h | 26 | ||||
| -rw-r--r-- | apps/plugins/oscilloscope.c | 4 | ||||
| -rw-r--r-- | apps/plugins/plasma.c | 2 | ||||
| -rw-r--r-- | apps/plugins/plugins.make | 2 | ||||
| -rw-r--r-- | apps/plugins/vu_meter.c | 2 |
13 files changed, 10 insertions, 40 deletions
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index ece8440..9e0ae7b 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c @@ -20,7 +20,7 @@ **************************************************************************/ #include "plugin.h" #include "time.h" -#include "lib/fixedpoint.h" +#include "fixedpoint.h" #include "lib/pluginlib_actions.h" diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index eef4f4d..e796afd 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c @@ -22,10 +22,10 @@ ****************************************************************************/ #include "plugin.h" +#include "fixedpoint.h" #include "lib/xlcd.h" #include "lib/pluginlib_actions.h" -#include "lib/fixedpoint.h" #include "lib/playback_control.h" #include "lib/highscore.h" diff --git a/apps/plugins/clock/clock_draw_analog.c b/apps/plugins/clock/clock_draw_analog.c index bda7241..62ada08 100644 --- a/apps/plugins/clock/clock_draw_analog.c +++ b/apps/plugins/clock/clock_draw_analog.c @@ -19,9 +19,9 @@ * ****************************************************************************/ +#include "fixedpoint.h" #include "clock_draw_analog.h" #include "lib/xlcd.h" -#include "lib/fixedpoint.h" #include "clock_bitmaps.h" #include "clock_bitmap_strings.h" diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index b6031af..34252e8 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -21,6 +21,7 @@ * ***************************************************************************/ #include "plugin.h" +#include "fixedpoint.h" #include "lib/playergfx.h" #include "lib/pluginlib_exit.h" #if LCD_DEPTH > 1 @@ -31,7 +32,6 @@ #include "lib/mylcd.h" /* MYLCD_CFG_GREYLIB or MYLCD_CFG_PGFX */ #endif #include "lib/xlcd.h" -#include "lib/fixedpoint.h" /* Loops that the values are displayed */ #define DISP_TIME 30 diff --git a/apps/plugins/fft/math.h b/apps/plugins/fft/math.h index ffacf1e..5545c49 100644 --- a/apps/plugins/fft/math.h +++ b/apps/plugins/fft/math.h @@ -3,7 +3,7 @@ #include <inttypes.h> #include <math.h> -#include "lib/fixedpoint.h" +#include "fixedpoint.h" #define Q_MUL(a, b, bits) (( (int64_t) (a) * (int64_t) (b) ) >> (bits)) #define Q15_MUL(a, b) Q_MUL(a,b,15) diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index 5813894..478296b 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c @@ -22,10 +22,10 @@ ****************************************************************************/ #include "plugin.h" +#include "fixedpoint.h" #include "lib/helper.h" #include "lib/pluginlib_actions.h" -#include "lib/fixedpoint.h" #ifndef HAVE_LCD_COLOR #include "lib/grey.h" diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES index d49605f..0a125db 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES @@ -4,7 +4,6 @@ helper.c md5.c jhash.c configfile.c -fixedpoint.c playback_control.c rgb_hsv.c highscore.c diff --git a/apps/plugins/lib/fixedpoint.c b/apps/plugins/lib/fixedpoint.c deleted file mode 100644 index 352e246..0000000 --- a/apps/plugins/lib/fixedpoint.c +++ /dev/null @@ -1 +0,0 @@ -#include "../../fixedpoint.c" diff --git a/apps/plugins/lib/fixedpoint.h b/apps/plugins/lib/fixedpoint.h deleted file mode 100644 index 811a1d9..0000000 --- a/apps/plugins/lib/fixedpoint.h +++ /dev/null @@ -1,26 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 Jens Arnold - * - * Fixed point library for plugins - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#ifndef _FIXEDPOINT_H_PLUGINS -#define _FIXEDPOINT_H_PLUGINS -#include "../../../firmware/include/fixedpoint.h" -#endif /* _FIXEDPOINT_H_PLUGINS */ diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 13cc359..a4ec6a8 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -22,13 +22,11 @@ ****************************************************************************/ #include "plugin.h" +#include "fixedpoint.h" #include "lib/helper.h" #include "lib/pluginlib_exit.h" - #include "lib/xlcd.h" #include "lib/configfile.h" -#include "fixedpoint.h" -#include "lib/fixedpoint.h" #include "lib/osd.h" /* variable button definitions */ diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 88afb85..5b2b3ae 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c @@ -25,6 +25,7 @@ ****************************************************************************/ #include "plugin.h" +#include "fixedpoint.h" #include "lib/helper.h" #include "lib/pluginlib_actions.h" #include "lib/pluginlib_exit.h" @@ -32,7 +33,6 @@ #ifndef HAVE_LCD_COLOR #include "lib/grey.h" #endif -#include "lib/fixedpoint.h" /******************************* Globals ***********************************/ diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 0fc8ba7..92769d7 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -53,7 +53,7 @@ else PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) endif -PLUGIN_LIBS := $(PLUGINLIB) $(PLUGINBITMAPLIB) $(SETJMPLIB) +PLUGIN_LIBS := $(PLUGINLIB) $(PLUGINBITMAPLIB) $(SETJMPLIB) $(FIXEDPOINTLIB) # include <dir>.make from each subdir (yay!) $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index ec88444..107d46b 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c @@ -18,7 +18,7 @@ * **************************************************************************/ #include "plugin.h" -#include "lib/fixedpoint.h" +#include "fixedpoint.h" #include "lib/playback_control.h" |