From 02da4e6130cebed9915b7eb5caedf2632b8ee5ba Mon Sep 17 00:00:00 2001 From: Magnus Holmgren Date: Mon, 30 Oct 2006 18:14:12 +0000 Subject: Update several codec Makefiles so that the codec libs build again on Coldfire targets, after the recent move of system-related things to the target tree. (Note to admins: make errors aren't detected on the CVS build page. :)) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11401 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/liba52/Makefile | 4 ++-- apps/codecs/libalac/Makefile | 4 ++-- apps/codecs/libffmpegFLAC/Makefile | 4 ++-- apps/codecs/libmusepack/Makefile | 4 ++-- apps/codecs/libwavpack/Makefile | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/codecs/liba52/Makefile b/apps/codecs/liba52/Makefile index 4fefc8a8ff..798ebc3434 100644 --- a/apps/codecs/liba52/Makefile +++ b/apps/codecs/liba52/Makefile @@ -15,8 +15,8 @@ ifdef APPEXTRA endif A52OPTS = -O2 -CFLAGS = $(GCCOPTS) $(A52OPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ - -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) +CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(A52OPTS) $(TARGET) \ +$(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) # This sets up 'SRC' based on the files mentioned in SOURCES include $(TOOLSDIR)/makesrc.inc diff --git a/apps/codecs/libalac/Makefile b/apps/codecs/libalac/Makefile index 07b901139f..1c526871f3 100644 --- a/apps/codecs/libalac/Makefile +++ b/apps/codecs/libalac/Makefile @@ -15,8 +15,8 @@ ifdef APPEXTRA endif ALACOPTS = -O3 -CFLAGS = $(GCCOPTS) $(ALACOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ - -DMEM=${MEMORYSIZE} +CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(ALACOPTS) $(TARGET) \ +$(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) # This sets up 'SRC' based on the files mentioned in SOURCES include $(TOOLSDIR)/makesrc.inc diff --git a/apps/codecs/libffmpegFLAC/Makefile b/apps/codecs/libffmpegFLAC/Makefile index 78c560bf75..02e91d673c 100644 --- a/apps/codecs/libffmpegFLAC/Makefile +++ b/apps/codecs/libffmpegFLAC/Makefile @@ -15,8 +15,8 @@ ifdef APPEXTRA endif FLACOPTS = -O2 -CFLAGS = $(INCLUDES) $(GCCOPTS) $(FLACOPTS) $(TARGET) $(EXTRA_DEFINES) \ - -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) +CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(FLACOPTS) $(TARGET) \ +$(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) # This sets up 'SRC' based on the files mentioned in SOURCES include $(TOOLSDIR)/makesrc.inc diff --git a/apps/codecs/libmusepack/Makefile b/apps/codecs/libmusepack/Makefile index d6bf174d2c..e50769719b 100644 --- a/apps/codecs/libmusepack/Makefile +++ b/apps/codecs/libmusepack/Makefile @@ -15,8 +15,8 @@ ifdef APPEXTRA endif MUSEPACKOPTS = -O2 -CFLAGS = $(INCLUDES) $(GCCOPTS) $(MUSEPACKOPTS) $(TARGET) $(EXTRA_DEFINES) \ - -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) +CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(MUSEPACKOPTS) $(TARGET) \ +$(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) # This sets up 'SRC' based on the files mentioned in SOURCES include $(TOOLSDIR)/makesrc.inc diff --git a/apps/codecs/libwavpack/Makefile b/apps/codecs/libwavpack/Makefile index 7afc9e1042..20daeb3411 100644 --- a/apps/codecs/libwavpack/Makefile +++ b/apps/codecs/libwavpack/Makefile @@ -15,8 +15,8 @@ ifdef APPEXTRA endif WAVPACKOPTS = -O2 -CFLAGS = $(INCLUDES) $(GCCOPTS) $(WAVPACKOPTS) $(TARGET) $(EXTRA_DEFINES) \ - -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) +CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(WAVPACKOPTS) $(TARGET) \ +$(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) # This sets up 'SRC' based on the files mentioned in SOURCES include $(TOOLSDIR)/makesrc.inc -- cgit v1.2.3