summaryrefslogtreecommitdiffstats
path: root/lib/rbcodec/test
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2012-03-27 00:16:09 +0200
committerThomas Martitz <kugel@rockbox.org>2012-03-27 00:16:09 +0200
commit83cb2e5daef2f13c8098cda3e6a9708a372e967c (patch)
tree54060e1c078fe0cdd9cc223a537be4c9a28b6a32 /lib/rbcodec/test
parentd5f4391187f8d1e93b313e8145ad81966308c913 (diff)
downloadrockbox-83cb2e5daef2f13c8098cda3e6a9708a372e967c.tar.gz
rockbox-83cb2e5daef2f13c8098cda3e6a9708a372e967c.tar.bz2
rockbox-83cb2e5daef2f13c8098cda3e6a9708a372e967c.zip
Fix warble and clean up/refactor Makefile.
Change-Id: I8754ad8724e22147b98a156fecea599bdda72292
Diffstat (limited to 'lib/rbcodec/test')
-rw-r--r--lib/rbcodec/test/warble.make18
1 files changed, 5 insertions, 13 deletions
diff --git a/lib/rbcodec/test/warble.make b/lib/rbcodec/test/warble.make
index 11f7ab03ec..2c1fb13889 100644
--- a/lib/rbcodec/test/warble.make
+++ b/lib/rbcodec/test/warble.make
@@ -12,7 +12,7 @@
RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec
RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec
-FLAGS=-g -D__PCTOOL__ $(TARGET) -Wall
+GCCOPTS += -D__PCTOOL__ $(TARGET) -DDEBUG -g -std=gnu99 `$(SDLCONFIG) --cflags` -DCODECDIR="\"$(CODECDIR)\""
SRC= $(call preprocess, $(ROOTDIR)/lib/rbcodec/test/SOURCES)
@@ -22,21 +22,13 @@ INCLUDES += -I$(ROOTDIR)/firmware/export -I$(ROOTDIR)/firmware/include \
-I$(ROOTDIR)/firmware/target/hosted \
-I$(ROOTDIR)/firmware/target/hosted/sdl
-GCCOPTS+=-D__PCTOOL__ -DDEBUG -g -std=gnu99 `$(SDLCONFIG) --cflags` -DCODECDIR="\"$(CODECDIR)\""
-
-LIBS=`$(SDLCONFIG) --libs` -lc
-ifneq ($(findstring MINGW,$(shell uname)),MINGW)
-LIBS += -ldl
-endif
.SECONDEXPANSION: # $$(OBJ) is not populated until after this
-include $(ROOTDIR)/tools/functions.make
-include $(ROOTDIR)/apps/codecs/codecs.make
-include $(ROOTDIR)/lib/rbcodec/rbcodec.make
-
$(BUILDDIR)/$(BINARY): $(CODECS)
-$(BUILDDIR)/$(BINARY): $$(OBJ) $(RBCODEC_LIB)
+$(BUILDDIR)/$(BINARY): $$(OBJ) $$(CORE_LIBS)
@echo LD $(BINARY)
- $(SILENT)$(HOSTCC) $(SIMFLAGS) $(LIBS) -o $@ $+
+ $(SILENT)$(HOSTCC) $(LDOPTS) -o $@ $(OBJ) \
+ -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
+ $(LDOPTS) $(GLOBAL_LDOPTS)