diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-08-18 15:17:25 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-08-18 15:17:25 +0000 |
commit | 46d7fb9b4a59dcebf9b68c38bc77b2c0f0761d33 (patch) | |
tree | 8165a373967a826ba67826b60f55911ac344c028 /apps/codecs/codecs.make | |
parent | 1466519bd8acb2ac9a26368c638ae42b01f5e890 (diff) | |
download | rockbox-46d7fb9b4a59dcebf9b68c38bc77b2c0f0761d33.tar.gz rockbox-46d7fb9b4a59dcebf9b68c38bc77b2c0f0761d33.zip |
Roll back r30328. Sorry for any inconvenience.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30329 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/codecs.make')
-rw-r--r-- | apps/codecs/codecs.make | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index 69c6600c30..19ff60ba3a 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make | |||
@@ -43,14 +43,13 @@ include $(APPSDIR)/codecs/librm/librm.make | |||
43 | include $(APPSDIR)/codecs/libatrac/libatrac.make | 43 | include $(APPSDIR)/codecs/libatrac/libatrac.make |
44 | include $(APPSDIR)/codecs/libpcm/libpcm.make | 44 | include $(APPSDIR)/codecs/libpcm/libpcm.make |
45 | include $(APPSDIR)/codecs/libtta/libtta.make | 45 | include $(APPSDIR)/codecs/libtta/libtta.make |
46 | include $(APPSDIR)/codecs/libgme/ay/libay.make | 46 | include $(APPSDIR)/codecs/libgme/libay.make |
47 | include $(APPSDIR)/codecs/libgme/gbs/libgbs.make | 47 | include $(APPSDIR)/codecs/libgme/libgbs.make |
48 | include $(APPSDIR)/codecs/libgme/hes/libhes.make | 48 | include $(APPSDIR)/codecs/libgme/libhes.make |
49 | include $(APPSDIR)/codecs/libgme/nsf/libnsf.make | 49 | include $(APPSDIR)/codecs/libgme/libnsf.make |
50 | include $(APPSDIR)/codecs/libgme/sgc/libsgc.make | 50 | include $(APPSDIR)/codecs/libgme/libsgc.make |
51 | include $(APPSDIR)/codecs/libgme/vgm/libvgm.make | 51 | include $(APPSDIR)/codecs/libgme/libvgm.make |
52 | include $(APPSDIR)/codecs/libgme/kss/libkss.make | 52 | include $(APPSDIR)/codecs/libgme/libkss.make |
53 | include $(APPSDIR)/codecs/libgme/emu2413/libemu2413.make | ||
54 | 53 | ||
55 | # compile flags for codecs | 54 | # compile flags for codecs |
56 | CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \ | 55 | CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \ |
@@ -104,10 +103,10 @@ $(CODECDIR)/tta.codec : $(CODECDIR)/libtta.a | |||
104 | $(CODECDIR)/ay.codec : $(CODECDIR)/libay.a | 103 | $(CODECDIR)/ay.codec : $(CODECDIR)/libay.a |
105 | $(CODECDIR)/gbs.codec : $(CODECDIR)/libgbs.a | 104 | $(CODECDIR)/gbs.codec : $(CODECDIR)/libgbs.a |
106 | $(CODECDIR)/hes.codec : $(CODECDIR)/libhes.a | 105 | $(CODECDIR)/hes.codec : $(CODECDIR)/libhes.a |
107 | $(CODECDIR)/nsf.codec : $(CODECDIR)/libnsf.a $(CODECDIR)/libemu2413.a | 106 | $(CODECDIR)/nsf.codec : $(CODECDIR)/libnsf.a |
108 | $(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a $(CODECDIR)/libemu2413.a | 107 | $(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a |
109 | $(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a $(CODECDIR)/libemu2413.a | 108 | $(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a |
110 | $(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a | 109 | $(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a |
111 | 110 | ||
112 | $(CODECS): $(CODECLIB) # this must be last in codec dependency list | 111 | $(CODECS): $(CODECLIB) # this must be last in codec dependency list |
113 | 112 | ||