summaryrefslogtreecommitdiffstats
path: root/apps/plugins/pdbox
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2010-06-21 16:34:13 +0000
committerFrank Gevaerts <frank@gevaerts.be>2010-06-21 16:34:13 +0000
commit3c78cb35e8681c6addf7302ed773677b8aa13edf (patch)
tree635f50f36584dd57c890dccb0fb5968af1aa56e5 /apps/plugins/pdbox
parent49dac9ae04df496e2c9b4aa387043aeb25ecbfde (diff)
downloadrockbox-3c78cb35e8681c6addf7302ed773677b8aa13edf.tar.gz
rockbox-3c78cb35e8681c6addf7302ed773677b8aa13edf.tar.bz2
rockbox-3c78cb35e8681c6addf7302ed773677b8aa13edf.zip
Remove plugin-specific defines from the pdbox makefile, and add them to m_pd.h, which is the global pdbox header. This makes sure that the defines are set during depency generation so dependencies are correct.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27016 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/pdbox')
-rw-r--r--apps/plugins/pdbox/PDa/intern/intern_setup.c2
-rw-r--r--apps/plugins/pdbox/PDa/src/d_imayer_fft.c1
-rw-r--r--apps/plugins/pdbox/PDa/src/m_pd.h7
-rw-r--r--apps/plugins/pdbox/PDa/src/makecostab.c1
-rw-r--r--apps/plugins/pdbox/pdbox.make3
5 files changed, 12 insertions, 2 deletions
diff --git a/apps/plugins/pdbox/PDa/intern/intern_setup.c b/apps/plugins/pdbox/PDa/intern/intern_setup.c
index 95d29b8cf5..d89cf286bb 100644
--- a/apps/plugins/pdbox/PDa/intern/intern_setup.c
+++ b/apps/plugins/pdbox/PDa/intern/intern_setup.c
@@ -1,3 +1,5 @@
+#include "m_pd.h"
+
#ifndef ROCKBOX
#include <stdio.h>
#endif
diff --git a/apps/plugins/pdbox/PDa/src/d_imayer_fft.c b/apps/plugins/pdbox/PDa/src/d_imayer_fft.c
index 3e07eac49e..a78b9370f4 100644
--- a/apps/plugins/pdbox/PDa/src/d_imayer_fft.c
+++ b/apps/plugins/pdbox/PDa/src/d_imayer_fft.c
@@ -9,6 +9,7 @@
** Computation: 2 *, 1 + per value.
*/
+#include "m_pd.h"
#include "m_fixed.h"
diff --git a/apps/plugins/pdbox/PDa/src/m_pd.h b/apps/plugins/pdbox/PDa/src/m_pd.h
index 49c0af9731..3dc4548781 100644
--- a/apps/plugins/pdbox/PDa/src/m_pd.h
+++ b/apps/plugins/pdbox/PDa/src/m_pd.h
@@ -12,6 +12,13 @@ extern "C" {
#define PD_MAJOR_VERSION 0 /* ... use these two instead. */
#define PD_MINOR_VERSION 37
+#ifdef ROCKBOX
+#define FIXEDPOINT
+#define STATIC
+#define PD
+#define USEAPI_ROCKBOX
+#endif
+
/* old name for "MSW" flag -- we have to take it for the sake of many old
"nmakefiles" for externs, which will define NT and not MSW */
#if defined(NT) && !defined(MSW)
diff --git a/apps/plugins/pdbox/PDa/src/makecostab.c b/apps/plugins/pdbox/PDa/src/makecostab.c
index 6b436b6e57..a57a8e8d1c 100644
--- a/apps/plugins/pdbox/PDa/src/makecostab.c
+++ b/apps/plugins/pdbox/PDa/src/makecostab.c
@@ -1,3 +1,4 @@
+#include "m_pd.h"
#include "m_fixed.h"
#include <math.h>
diff --git a/apps/plugins/pdbox/pdbox.make b/apps/plugins/pdbox/pdbox.make
index 7031717d38..7abb31f3bb 100644
--- a/apps/plugins/pdbox/pdbox.make
+++ b/apps/plugins/pdbox/pdbox.make
@@ -20,8 +20,7 @@ OTHER_SRC += $(PDBOX_SRC)
$(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) $(MPEG_OBJ) $(CODECDIR)/libtlsf.a
-PDBOXFLAGS = $(PLUGINFLAGS) \
- -DFIXEDPOINT -DSTATIC -DPD -DUSEAPI_ROCKBOX
+PDBOXFLAGS = $(PLUGINFLAGS)
# Compile PDBox with extra flags (adapted from ZXBox)
$(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PDBOXSRCDIR)/pdbox.make