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
This commit is contained in:
Frank Gevaerts 2010-06-21 16:34:13 +00:00
parent 49dac9ae04
commit 3c78cb35e8
5 changed files with 12 additions and 2 deletions

View file

@ -1,3 +1,5 @@
#include "m_pd.h"
#ifndef ROCKBOX #ifndef ROCKBOX
#include <stdio.h> #include <stdio.h>
#endif #endif

View file

@ -9,6 +9,7 @@
** Computation: 2 *, 1 + per value. ** Computation: 2 *, 1 + per value.
*/ */
#include "m_pd.h"
#include "m_fixed.h" #include "m_fixed.h"

View file

@ -12,6 +12,13 @@ extern "C" {
#define PD_MAJOR_VERSION 0 /* ... use these two instead. */ #define PD_MAJOR_VERSION 0 /* ... use these two instead. */
#define PD_MINOR_VERSION 37 #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 /* 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 */ "nmakefiles" for externs, which will define NT and not MSW */
#if defined(NT) && !defined(MSW) #if defined(NT) && !defined(MSW)

View file

@ -1,3 +1,4 @@
#include "m_pd.h"
#include "m_fixed.h" #include "m_fixed.h"
#include <math.h> #include <math.h>

View file

@ -20,8 +20,7 @@ OTHER_SRC += $(PDBOX_SRC)
$(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) $(MPEG_OBJ) $(CODECDIR)/libtlsf.a $(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) $(MPEG_OBJ) $(CODECDIR)/libtlsf.a
PDBOXFLAGS = $(PLUGINFLAGS) \ PDBOXFLAGS = $(PLUGINFLAGS)
-DFIXEDPOINT -DSTATIC -DPD -DUSEAPI_ROCKBOX
# Compile PDBox with extra flags (adapted from ZXBox) # Compile PDBox with extra flags (adapted from ZXBox)
$(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PDBOXSRCDIR)/pdbox.make $(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PDBOXSRCDIR)/pdbox.make