Allow to use different compiler settings for codecs built from libgme. ARM now uses -O1 except for the 2413 emulator. The speed on PP5022 increases by 0-5% (NSF, YM2413-VGM), 5-10% (GBS, VGM) and 10-15% (SGC, KSS, AY).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30328 a1c6a512-1295-4272-9138-f99709370657
author: Andree Buschmann <AndreeBuschmann@t-online.de> 2011-08-18 14:01:31 +0000
committer: Andree Buschmann <AndreeBuschmann@t-online.de> 2011-08-18 14:01:31 +0000
commit: 1466519bd8acb2ac9a26368c638ae42b01f5e890 (patch)
tree: fea39c793a8637226a3b724a45325cd2fc4f8dba /apps
parent: 4d01ace73fdffca366211157b54418516b3a73b6 (diff)
download: rockbox-1466519bd8acb2ac9a26368c638ae42b01f5e890.tar.gz
rockbox-1466519bd8acb2ac9a26368c638ae42b01f5e890.zip
30 files changed, 247 insertions, 208 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index 19ff60ba3a..69c6600c30 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -43,13 +43,14 @@ include $(APPSDIR)/codecs/librm/librm.make
 include $(APPSDIR)/codecs/libatrac/libatrac.make
 include $(APPSDIR)/codecs/libpcm/libpcm.make
 include $(APPSDIR)/codecs/libtta/libtta.make
-include $(APPSDIR)/codecs/libgme/libay.make
+include $(APPSDIR)/codecs/libgme/ay/libay.make
-include $(APPSDIR)/codecs/libgme/libgbs.make
+include $(APPSDIR)/codecs/libgme/gbs/libgbs.make
-include $(APPSDIR)/codecs/libgme/libhes.make
+include $(APPSDIR)/codecs/libgme/hes/libhes.make
-include $(APPSDIR)/codecs/libgme/libnsf.make
+include $(APPSDIR)/codecs/libgme/nsf/libnsf.make
-include $(APPSDIR)/codecs/libgme/libsgc.make
+include $(APPSDIR)/codecs/libgme/sgc/libsgc.make
-include $(APPSDIR)/codecs/libgme/libvgm.make
+include $(APPSDIR)/codecs/libgme/vgm/libvgm.make
-include $(APPSDIR)/codecs/libgme/libkss.make
+include $(APPSDIR)/codecs/libgme/kss/libkss.make
+include $(APPSDIR)/codecs/libgme/emu2413/libemu2413.make
 # compile flags for codecs
 CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \
@@ -103,10 +104,10 @@ $(CODECDIR)/tta.codec : $(CODECDIR)/libtta.a
 $(CODECDIR)/ay.codec : $(CODECDIR)/libay.a
 $(CODECDIR)/gbs.codec : $(CODECDIR)/libgbs.a
 $(CODECDIR)/hes.codec : $(CODECDIR)/libhes.a
-$(CODECDIR)/nsf.codec : $(CODECDIR)/libnsf.a
+$(CODECDIR)/nsf.codec : $(CODECDIR)/libnsf.a $(CODECDIR)/libemu2413.a
-$(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a
+$(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a $(CODECDIR)/libemu2413.a
-$(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a
+$(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a $(CODECDIR)/libemu2413.a
-$(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a
+$(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a
 $(CODECS): $(CODECLIB) # this must be last in codec dependency list
diff --git a/apps/codecs/libgme/AYSOURCES b/apps/codecs/libgme/AYSOURCES
index 51253fe2f1..e69de29bb2 100644
--- a/apps/codecs/libgme/AYSOURCES
+++ b/apps/codecs/libgme/AYSOURCES
@@ -1,6 +0,0 @@
-ay_apu.c
-ay_cpu.c
-ay_emu.c
-blip_buffer.c
-multi_buffer.c
-z80_cpu.c
diff --git a/apps/codecs/libgme/GBSSOURCES b/apps/codecs/libgme/GBSSOURCES
index 5548fd85eb..e69de29bb2 100644
--- a/apps/codecs/libgme/GBSSOURCES
+++ b/apps/codecs/libgme/GBSSOURCES
@@ -1,8 +0,0 @@
-gb_apu.c
-gb_cpu.c
-gbs_cpu.c
-gb_oscs.c
-gbs_emu.c
-blip_buffer.c
-multi_buffer.c
-rom_data.c
diff --git a/apps/codecs/libgme/HESSOURCES b/apps/codecs/libgme/HESSOURCES
index 58a38f2f5a..e69de29bb2 100644
--- a/apps/codecs/libgme/HESSOURCES
+++ b/apps/codecs/libgme/HESSOURCES
@@ -1,7 +0,0 @@
-hes_apu.c
-hes_apu_adpcm.c
-hes_cpu.c
-hes_emu.c
-blip_buffer.c
-multi_buffer.c
-rom_data.c
diff --git a/apps/codecs/libgme/KSSSOURCES b/apps/codecs/libgme/KSSSOURCES
index 8e9c6601bb..e69de29bb2 100644
--- a/apps/codecs/libgme/KSSSOURCES
+++ b/apps/codecs/libgme/KSSSOURCES
@@ -1,13 +0,0 @@
-ay_apu.c
-kss_cpu.c
-kss_emu.c
-kss_scc_apu.c
-opl_apu.c
-sms_apu.c
-z80_cpu.c
-blip_buffer.c
-multi_buffer.c
-rom_data.c
-emu2413.c
-emu8950.c
-emuadpcm.c
diff --git a/apps/codecs/libgme/NSFSOURCES b/apps/codecs/libgme/NSFSOURCES
index d96e1d3f32..e69de29bb2 100644
--- a/apps/codecs/libgme/NSFSOURCES
+++ b/apps/codecs/libgme/NSFSOURCES
@@ -1,15 +0,0 @@
-nes_apu.c
-nes_cpu.c
-nes_fds_apu.c
-nes_fme7_apu.c
-nes_namco_apu.c
-nes_oscs.c
-nes_vrc6_apu.c
-nes_vrc7_apu.c
-nsf_cpu.c
-nsf_emu.c
-nsfe_info.c
-blip_buffer.c
-multi_buffer.c
-rom_data.c
-emu2413.c
diff --git a/apps/codecs/libgme/SGCSOURCES b/apps/codecs/libgme/SGCSOURCES
index 72b06efef9..e69de29bb2 100644
--- a/apps/codecs/libgme/SGCSOURCES
+++ b/apps/codecs/libgme/SGCSOURCES
@@ -1,10 +0,0 @@
-sgc_cpu.c
-sgc_emu.c
-sms_apu.c
-sms_fm_apu.c
-ym2413_emu.c
-z80_cpu.c
-blip_buffer.c
-multi_buffer.c
-rom_data.c
-emu2413.c
diff --git a/apps/codecs/libgme/VGMSOURCES b/apps/codecs/libgme/VGMSOURCES
index ed32baca0d..e69de29bb2 100644
--- a/apps/codecs/libgme/VGMSOURCES
+++ b/apps/codecs/libgme/VGMSOURCES
@@ -1,12 +0,0 @@
-blip_buffer.c
-multi_buffer.c
-resampler.c
-sms_apu.c
-vgm_emu.c
-emu2413.c
-ym2413_emu.c
-ym2612_emu.c
-inflate/bbfuncs.c
-inflate/inflate.c
-inflate/mallocer.c
-inflate/mbreader.c
diff --git a/apps/codecs/libgme/ay/AYSOURCES b/apps/codecs/libgme/ay/AYSOURCES
new file mode 100755
index 0000000000..51253fe2f1
--- /dev/null
+++ b/apps/codecs/libgme/ay/AYSOURCES
@@ -0,0 +1,6 @@
+ay_apu.c
+ay_cpu.c
+ay_emu.c
+blip_buffer.c
+multi_buffer.c
+z80_cpu.c
diff --git a/apps/codecs/libgme/ay/libay.make b/apps/codecs/libgme/ay/libay.make
new file mode 100755
index 0000000000..9ad661986d
--- /dev/null
+++ b/apps/codecs/libgme/ay/libay.make
@@ -0,0 +1,21 @@
+# libay
+AYLIB := $(CODECDIR)/libay.a
+AYLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/ay/AYSOURCES)
+AYLIB_OBJ := $(call c2obj, $(AYLIB_SRC))
+OTHER_SRC += $(AYLIB_SRC)
+$(AYLIB): $(AYLIB_OBJ)
+        $(SILENT)$(shell rm -f $@)
+        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+AYFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_AY_TYPE
+ifeq ($(CPU),arm)
+   AYFLAGS += -O1
+else
+   AYFLAGS += -O2
+endif
+$(CODECDIR)/libgme/ay/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
+        $(SILENT)mkdir -p $(dir $@)
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(AYFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/emu2413/EMU2413SOURCES b/apps/codecs/libgme/emu2413/EMU2413SOURCES
new file mode 100644
index 0000000000..dcde7ea719
--- /dev/null
+++ b/apps/codecs/libgme/emu2413/EMU2413SOURCES
@@ -0,0 +1,3 @@
+sms_fm_apu.c
+ym2413_emu.c
+emu2413.c
diff --git a/apps/codecs/libgme/emu2413/libemu2413.make b/apps/codecs/libgme/emu2413/libemu2413.make
new file mode 100644
index 0000000000..74f51c7664
--- /dev/null
+++ b/apps/codecs/libgme/emu2413/libemu2413.make
@@ -0,0 +1,21 @@
+# libemu
+EMULIB := $(CODECDIR)/libemu2413.a
+EMULIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/emu2413/EMU2413SOURCES)
+EMULIB_OBJ := $(call c2obj, $(EMULIB_SRC))
+OTHER_SRC += $(EMULIB_SRC)
+$(EMULIB): $(EMULIB_OBJ)
+        $(SILENT)$(shell rm -f $@)
+        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+EMUFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_EMU_TYPE
+ifeq ($(CPU),arm)
+   EMUFLAGS += -O3
+else
+   EMUFLAGS += -O2
+endif
+$(CODECDIR)/libgme/emu2413/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
+        $(SILENT)mkdir -p $(dir $@)
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(EMUFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/gbs/GBSSOURCES b/apps/codecs/libgme/gbs/GBSSOURCES
new file mode 100644
index 0000000000..5548fd85eb
--- /dev/null
+++ b/apps/codecs/libgme/gbs/GBSSOURCES
@@ -0,0 +1,8 @@
+gb_apu.c
+gb_cpu.c
+gbs_cpu.c
+gb_oscs.c
+gbs_emu.c
+blip_buffer.c
+multi_buffer.c
+rom_data.c
diff --git a/apps/codecs/libgme/gbs/libgbs.make b/apps/codecs/libgme/gbs/libgbs.make
new file mode 100644
index 0000000000..260e0bc324
--- /dev/null
+++ b/apps/codecs/libgme/gbs/libgbs.make
@@ -0,0 +1,21 @@
+# libgbs
+GBSLIB := $(CODECDIR)/libgbs.a
+GBSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/gbs/GBSSOURCES)
+GBSLIB_OBJ := $(call c2obj, $(GBSLIB_SRC))
+OTHER_SRC += $(GBSLIB_SRC)
+$(GBSLIB): $(GBSLIB_OBJ)
+        $(SILENT)$(shell rm -f $@)
+        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+GBSFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_GBS_TYPE
+ifeq ($(CPU),arm)
+   GBSFLAGS += -O1
+else
+   GBSFLAGS += -O2
+endif
+$(CODECDIR)/libgme/gbs/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
+        $(SILENT)mkdir -p $(dir $@)
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(GBSFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/hes/HESSOURCES b/apps/codecs/libgme/hes/HESSOURCES
new file mode 100644
index 0000000000..58a38f2f5a
--- /dev/null
+++ b/apps/codecs/libgme/hes/HESSOURCES
@@ -0,0 +1,7 @@
+hes_apu.c
+hes_apu_adpcm.c
+hes_cpu.c
+hes_emu.c
+blip_buffer.c
+multi_buffer.c
+rom_data.c
diff --git a/apps/codecs/libgme/hes/libhes.make b/apps/codecs/libgme/hes/libhes.make
new file mode 100644
index 0000000000..6d89eae248
--- /dev/null
+++ b/apps/codecs/libgme/hes/libhes.make
@@ -0,0 +1,21 @@
+# libhes
+HESLIB := $(CODECDIR)/libhes.a
+HESLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/hes/HESSOURCES)
+HESLIB_OBJ := $(call c2obj, $(HESLIB_SRC))
+OTHER_SRC += $(HESLIB_SRC)
+$(HESLIB): $(HESLIB_OBJ)
+        $(SILENT)$(shell rm -f $@)
+        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+HESFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_HES_TYPE
+ifeq ($(CPU),arm)
+   HESFLAGS += -O1
+else
+   HESFLAGS += -O2
+endif
+$(CODECDIR)/libgme/hes/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
+        $(SILENT)mkdir -p $(dir $@)
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(HESFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/kss/KSSSOURCES b/apps/codecs/libgme/kss/KSSSOURCES
new file mode 100755
index 0000000000..61dd42ad51
--- /dev/null
+++ b/apps/codecs/libgme/kss/KSSSOURCES
@@ -0,0 +1,12 @@
+ay_apu.c
+kss_cpu.c
+kss_emu.c
+kss_scc_apu.c
+opl_apu.c
+sms_apu.c
+z80_cpu.c
+blip_buffer.c
+multi_buffer.c
+rom_data.c
+emu8950.c
+emuadpcm.c
diff --git a/apps/codecs/libgme/kss/libkss.make b/apps/codecs/libgme/kss/libkss.make
new file mode 100755
index 0000000000..115d28b557
--- /dev/null
+++ b/apps/codecs/libgme/kss/libkss.make
@@ -0,0 +1,21 @@
+# libkss
+KSSLIB := $(CODECDIR)/libkss.a
+KSSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/kss/KSSSOURCES)
+KSSLIB_OBJ := $(call c2obj, $(KSSLIB_SRC))
+OTHER_SRC += $(KSSLIB_SRC)
+$(KSSLIB): $(KSSLIB_OBJ)
+        $(SILENT)$(shell rm -f $@)
+        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+KSSFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_KSS_TYPE
+ifeq ($(CPU),arm)
+   KSSFLAGS += -O1
+else
+   KSSFLAGS += -O2
+endif
+$(CODECDIR)/libgme/kss/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
+        $(SILENT)mkdir -p $(dir $@)
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(KSSFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/libgbs.make b/apps/codecs/libgme/libgbs.make
index cf6ff01274..e69de29bb2 100644
--- a/apps/codecs/libgme/libgbs.make
+++ b/apps/codecs/libgme/libgbs.make
@@ -1,21 +0,0 @@
-# libgbs
-GBSLIB := $(CODECDIR)/libgbs.a
-GBSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/GBSSOURCES)
-GBSLIB_OBJ := $(call c2obj, $(GBSLIB_SRC))
-OTHER_SRC += $(GBSLIB_SRC)
-$(GBSLIB): $(GBSLIB_OBJ)
-        $(SILENT)$(shell rm -f $@)
-        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
-GBSFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_GBS_TYPE
-ifeq ($(CPU),arm)
-   GBSFLAGS += -O3
-else
-   GBSFLAGS += -O2
-endif
-$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
-        $(SILENT)mkdir -p $(dir $@)
-        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(GBSFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/libhes.make b/apps/codecs/libgme/libhes.make
index e0018565fb..e69de29bb2 100644
--- a/apps/codecs/libgme/libhes.make
+++ b/apps/codecs/libgme/libhes.make
@@ -1,21 +0,0 @@
-# libhes
-HESLIB := $(CODECDIR)/libhes.a
-HESLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/HESSOURCES)
-HESLIB_OBJ := $(call c2obj, $(HESLIB_SRC))
-OTHER_SRC += $(HESLIB_SRC)
-$(HESLIB): $(HESLIB_OBJ)
-        $(SILENT)$(shell rm -f $@)
-        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
-HESFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_HES_TYPE
-ifeq ($(CPU),arm)
-   HESFLAGS += -O3
-else
-   HESFLAGS += -O2
-endif
-$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
-        $(SILENT)mkdir -p $(dir $@)
-        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(HESFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/libkss.make b/apps/codecs/libgme/libkss.make
index 0e2dd54bc2..e69de29bb2 100644
--- a/apps/codecs/libgme/libkss.make
+++ b/apps/codecs/libgme/libkss.make
@@ -1,21 +0,0 @@
-# libkss
-KSSLIB := $(CODECDIR)/libkss.a
-KSSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/KSSSOURCES)
-KSSLIB_OBJ := $(call c2obj, $(KSSLIB_SRC))
-OTHER_SRC += $(KSSLIB_SRC)
-$(KSSLIB): $(KSSLIB_OBJ)
-        $(SILENT)$(shell rm -f $@)
-        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
-KSSFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_KSS_TYPE
-ifeq ($(CPU),arm)
-   KSSFLAGS += -O3
-else
-   KSSFLAGS += -O2
-endif
-$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
-        $(SILENT)mkdir -p $(dir $@)
-        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(KSSFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/libnsf.make b/apps/codecs/libgme/libnsf.make
index 8b9df7526f..e69de29bb2 100644
--- a/apps/codecs/libgme/libnsf.make
+++ b/apps/codecs/libgme/libnsf.make
@@ -1,21 +0,0 @@
-# libnsf
-NSFLIB := $(CODECDIR)/libnsf.a
-NSFLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/NSFSOURCES)
-NSFLIB_OBJ := $(call c2obj, $(NSFLIB_SRC))
-OTHER_SRC += $(NSFLIB_SRC)
-$(NSFLIB): $(NSFLIB_OBJ)
-        $(SILENT)$(shell rm -f $@)
-        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
-NSFFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_NSF_TYPE
-ifeq ($(CPU),arm)
-   NSFFLAGS += -O3
-else
-   NSFFLAGS += -O2
-endif
-$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
-        $(SILENT)mkdir -p $(dir $@)
-        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(NSFFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/libsgc.make b/apps/codecs/libgme/libsgc.make
index 0defe788c6..e69de29bb2 100644
--- a/apps/codecs/libgme/libsgc.make
+++ b/apps/codecs/libgme/libsgc.make
@@ -1,21 +0,0 @@
-# libsgc
-SGCLIB := $(CODECDIR)/libsgc.a
-SGCLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/SGCSOURCES)
-SGCLIB_OBJ := $(call c2obj, $(SGCLIB_SRC))
-OTHER_SRC += $(SGCLIB_SRC)
-$(SGCLIB): $(SGCLIB_OBJ)
-        $(SILENT)$(shell rm -f $@)
-        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
-SGCFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_SGC_TYPE
-ifeq ($(CPU),arm)
-   SGCFLAGS += -O3
-else
-   SGCFLAGS += -O2
-endif
-$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
-        $(SILENT)mkdir -p $(dir $@)
-        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SGCFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/libvgm.make b/apps/codecs/libgme/libvgm.make
index f0e7cbb598..e69de29bb2 100644
--- a/apps/codecs/libgme/libvgm.make
+++ b/apps/codecs/libgme/libvgm.make
@@ -1,21 +0,0 @@
-# libvgm
-VGMLIB := $(CODECDIR)/libvgm.a
-VGMLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/VGMSOURCES)
-VGMLIB_OBJ := $(call c2obj, $(VGMLIB_SRC))
-OTHER_SRC += $(VGMLIB_SRC)
-$(VGMLIB): $(VGMLIB_OBJ)
-        $(SILENT)$(shell rm -f $@)
-        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
-VGMFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_VGM_TYPE
-ifeq ($(CPU),arm)
-   VGMFLAGS += -O3
-else
-   VGMFLAGS += -O2
-endif
-$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
-        $(SILENT)mkdir -p $(dir $@)
-        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VGMFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/nsf/NSFSOURCES b/apps/codecs/libgme/nsf/NSFSOURCES
new file mode 100644
index 0000000000..54b4f82f60
--- /dev/null
+++ b/apps/codecs/libgme/nsf/NSFSOURCES
@@ -0,0 +1,14 @@
+nes_apu.c
+nes_cpu.c
+nes_fds_apu.c
+nes_fme7_apu.c
+nes_namco_apu.c
+nes_oscs.c
+nes_vrc6_apu.c
+nes_vrc7_apu.c
+nsf_cpu.c
+nsf_emu.c
+nsfe_info.c
+blip_buffer.c
+multi_buffer.c
+rom_data.c
diff --git a/apps/codecs/libgme/nsf/libnsf.make b/apps/codecs/libgme/nsf/libnsf.make
new file mode 100644
index 0000000000..644aa7408c
--- /dev/null
+++ b/apps/codecs/libgme/nsf/libnsf.make
@@ -0,0 +1,21 @@
+# libnsf
+NSFLIB := $(CODECDIR)/libnsf.a
+NSFLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/nsf/NSFSOURCES)
+NSFLIB_OBJ := $(call c2obj, $(NSFLIB_SRC))
+OTHER_SRC += $(NSFLIB_SRC)
+$(NSFLIB): $(NSFLIB_OBJ)
+        $(SILENT)$(shell rm -f $@)
+        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+NSFFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_NSF_TYPE
+ifeq ($(CPU),arm)
+   NSFFLAGS += -O1
+else
+   NSFFLAGS += -O2
+endif
+$(CODECDIR)/libgme/nsf/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
+        $(SILENT)mkdir -p $(dir $@)
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(NSFFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/sgc/SGCSOURCES b/apps/codecs/libgme/sgc/SGCSOURCES
new file mode 100644
index 0000000000..624d1cb897
--- /dev/null
+++ b/apps/codecs/libgme/sgc/SGCSOURCES
@@ -0,0 +1,7 @@
+sgc_cpu.c
+sgc_emu.c
+sms_apu.c
+z80_cpu.c
+blip_buffer.c
+multi_buffer.c
+rom_data.c
diff --git a/apps/codecs/libgme/sgc/libsgc.make b/apps/codecs/libgme/sgc/libsgc.make
new file mode 100644
index 0000000000..6984cdc4bb
--- /dev/null
+++ b/apps/codecs/libgme/sgc/libsgc.make
@@ -0,0 +1,21 @@
+# libsgc
+SGCLIB := $(CODECDIR)/libsgc.a
+SGCLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/sgc/SGCSOURCES)
+SGCLIB_OBJ := $(call c2obj, $(SGCLIB_SRC))
+OTHER_SRC += $(SGCLIB_SRC)
+$(SGCLIB): $(SGCLIB_OBJ)
+        $(SILENT)$(shell rm -f $@)
+        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+SGCFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_SGC_TYPE
+ifeq ($(CPU),arm)
+   SGCFLAGS += -O1
+else
+   SGCFLAGS += -O2
+endif
+$(CODECDIR)/libgme/sgc/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
+        $(SILENT)mkdir -p $(dir $@)
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SGCFLAGS) -c $< -o $@
diff --git a/apps/codecs/libgme/vgm/VGMSOURCES b/apps/codecs/libgme/vgm/VGMSOURCES
new file mode 100644
index 0000000000..32a8b356a1
--- /dev/null
+++ b/apps/codecs/libgme/vgm/VGMSOURCES
@@ -0,0 +1,10 @@
+blip_buffer.c
+multi_buffer.c
+resampler.c
+sms_apu.c
+vgm_emu.c
+ym2612_emu.c
+inflate/bbfuncs.c
+inflate/inflate.c
+inflate/mallocer.c
+inflate/mbreader.c
diff --git a/apps/codecs/libgme/vgm/libvgm.make b/apps/codecs/libgme/vgm/libvgm.make
new file mode 100644
index 0000000000..2ff7f94fab
--- /dev/null
+++ b/apps/codecs/libgme/vgm/libvgm.make
@@ -0,0 +1,21 @@
+# libvgm
+VGMLIB := $(CODECDIR)/libvgm.a
+VGMLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/vgm/VGMSOURCES)
+VGMLIB_OBJ := $(call c2obj, $(VGMLIB_SRC))
+OTHER_SRC += $(VGMLIB_SRC)
+$(VGMLIB): $(VGMLIB_OBJ)
+        $(SILENT)$(shell rm -f $@)
+        $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+VGMFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_VGM_TYPE
+ifeq ($(CPU),arm)
+   VGMFLAGS += -O1
+else
+   VGMFLAGS += -O2
+endif
+$(CODECDIR)/libgme/vgm/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
+        $(SILENT)mkdir -p $(dir $@)
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VGMFLAGS) -c $< -o $@
author	Andree Buschmann <AndreeBuschmann@t-online.de>	2011-08-18 14:01:31 +0000
committer	Andree Buschmann <AndreeBuschmann@t-online.de>	2011-08-18 14:01:31 +0000
commit	1466519bd8acb2ac9a26368c638ae42b01f5e890 (patch)
tree	fea39c793a8637226a3b724a45325cd2fc4f8dba /apps
parent	4d01ace73fdffca366211157b54418516b3a73b6 (diff)
download	rockbox-1466519bd8acb2ac9a26368c638ae42b01f5e890.tar.gz rockbox-1466519bd8acb2ac9a26368c638ae42b01f5e890.zip

diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index 19ff60ba3a..69c6600c30 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make
@@ -43,13 +43,14 @@ 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/libay.make	46	include $(APPSDIR)/codecs/libgme/ay/libay.make
47	include $(APPSDIR)/codecs/libgme/libgbs.make	47	include $(APPSDIR)/codecs/libgme/gbs/libgbs.make
48	include $(APPSDIR)/codecs/libgme/libhes.make	48	include $(APPSDIR)/codecs/libgme/hes/libhes.make
49	include $(APPSDIR)/codecs/libgme/libnsf.make	49	include $(APPSDIR)/codecs/libgme/nsf/libnsf.make
50	include $(APPSDIR)/codecs/libgme/libsgc.make	50	include $(APPSDIR)/codecs/libgme/sgc/libsgc.make
51	include $(APPSDIR)/codecs/libgme/libvgm.make	51	include $(APPSDIR)/codecs/libgme/vgm/libvgm.make
52	include $(APPSDIR)/codecs/libgme/libkss.make	52	include $(APPSDIR)/codecs/libgme/kss/libkss.make
		53	include $(APPSDIR)/codecs/libgme/emu2413/libemu2413.make
53		54
54	# compile flags for codecs	55	# compile flags for codecs
55	CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \	56	CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \
@@ -103,10 +104,10 @@ $(CODECDIR)/tta.codec : $(CODECDIR)/libtta.a
103	$(CODECDIR)/ay.codec : $(CODECDIR)/libay.a	104	$(CODECDIR)/ay.codec : $(CODECDIR)/libay.a
104	$(CODECDIR)/gbs.codec : $(CODECDIR)/libgbs.a	105	$(CODECDIR)/gbs.codec : $(CODECDIR)/libgbs.a
105	$(CODECDIR)/hes.codec : $(CODECDIR)/libhes.a	106	$(CODECDIR)/hes.codec : $(CODECDIR)/libhes.a
106	$(CODECDIR)/nsf.codec : $(CODECDIR)/libnsf.a	107	$(CODECDIR)/nsf.codec : $(CODECDIR)/libnsf.a $(CODECDIR)/libemu2413.a
107	$(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a	108	$(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a $(CODECDIR)/libemu2413.a
108	$(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a	109	$(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a $(CODECDIR)/libemu2413.a
109	$(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a	110	$(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a
110		111
111	$(CODECS): $(CODECLIB) # this must be last in codec dependency list	112	$(CODECS): $(CODECLIB) # this must be last in codec dependency list
112		113


diff --git a/apps/codecs/libgme/AYSOURCES b/apps/codecs/libgme/AYSOURCES index 51253fe2f1..e69de29bb2 100644 --- a/apps/codecs/libgme/AYSOURCES +++ b/apps/codecs/libgme/AYSOURCES
@@ -1,6 +0,0 @@
1	ay_apu.c
2	ay_cpu.c
3	ay_emu.c
4	blip_buffer.c
5	multi_buffer.c
6	z80_cpu.c


diff --git a/apps/codecs/libgme/GBSSOURCES b/apps/codecs/libgme/GBSSOURCES index 5548fd85eb..e69de29bb2 100644 --- a/apps/codecs/libgme/GBSSOURCES +++ b/apps/codecs/libgme/GBSSOURCES
@@ -1,8 +0,0 @@
1	gb_apu.c
2	gb_cpu.c
3	gbs_cpu.c
4	gb_oscs.c
5	gbs_emu.c
6	blip_buffer.c
7	multi_buffer.c
8	rom_data.c


diff --git a/apps/codecs/libgme/HESSOURCES b/apps/codecs/libgme/HESSOURCES index 58a38f2f5a..e69de29bb2 100644 --- a/apps/codecs/libgme/HESSOURCES +++ b/apps/codecs/libgme/HESSOURCES
@@ -1,7 +0,0 @@
1	hes_apu.c
2	hes_apu_adpcm.c
3	hes_cpu.c
4	hes_emu.c
5	blip_buffer.c
6	multi_buffer.c
7	rom_data.c


diff --git a/apps/codecs/libgme/KSSSOURCES b/apps/codecs/libgme/KSSSOURCES index 8e9c6601bb..e69de29bb2 100644 --- a/apps/codecs/libgme/KSSSOURCES +++ b/apps/codecs/libgme/KSSSOURCES
@@ -1,13 +0,0 @@
1	ay_apu.c
2	kss_cpu.c
3	kss_emu.c
4	kss_scc_apu.c
5	opl_apu.c
6	sms_apu.c
7	z80_cpu.c
8	blip_buffer.c
9	multi_buffer.c
10	rom_data.c
11	emu2413.c
12	emu8950.c
13	emuadpcm.c


diff --git a/apps/codecs/libgme/NSFSOURCES b/apps/codecs/libgme/NSFSOURCES index d96e1d3f32..e69de29bb2 100644 --- a/apps/codecs/libgme/NSFSOURCES +++ b/apps/codecs/libgme/NSFSOURCES
@@ -1,15 +0,0 @@
1	nes_apu.c
2	nes_cpu.c
3	nes_fds_apu.c
4	nes_fme7_apu.c
5	nes_namco_apu.c
6	nes_oscs.c
7	nes_vrc6_apu.c
8	nes_vrc7_apu.c
9	nsf_cpu.c
10	nsf_emu.c
11	nsfe_info.c
12	blip_buffer.c
13	multi_buffer.c
14	rom_data.c
15	emu2413.c


diff --git a/apps/codecs/libgme/SGCSOURCES b/apps/codecs/libgme/SGCSOURCES index 72b06efef9..e69de29bb2 100644 --- a/apps/codecs/libgme/SGCSOURCES +++ b/apps/codecs/libgme/SGCSOURCES
@@ -1,10 +0,0 @@
1	sgc_cpu.c
2	sgc_emu.c
3	sms_apu.c
4	sms_fm_apu.c
5	ym2413_emu.c
6	z80_cpu.c
7	blip_buffer.c
8	multi_buffer.c
9	rom_data.c
10	emu2413.c


diff --git a/apps/codecs/libgme/VGMSOURCES b/apps/codecs/libgme/VGMSOURCES index ed32baca0d..e69de29bb2 100644 --- a/apps/codecs/libgme/VGMSOURCES +++ b/apps/codecs/libgme/VGMSOURCES
@@ -1,12 +0,0 @@
1	blip_buffer.c
2	multi_buffer.c
3	resampler.c
4	sms_apu.c
5	vgm_emu.c
6	emu2413.c
7	ym2413_emu.c
8	ym2612_emu.c
9	inflate/bbfuncs.c
10	inflate/inflate.c
11	inflate/mallocer.c
12	inflate/mbreader.c


diff --git a/apps/codecs/libgme/ay/AYSOURCES b/apps/codecs/libgme/ay/AYSOURCES new file mode 100755 index 0000000000..51253fe2f1 --- /dev/null +++ b/apps/codecs/libgme/ay/AYSOURCES
@@ -0,0 +1,6 @@
		1	ay_apu.c
		2	ay_cpu.c
		3	ay_emu.c
		4	blip_buffer.c
		5	multi_buffer.c
		6	z80_cpu.c


diff --git a/apps/codecs/libgme/ay/libay.make b/apps/codecs/libgme/ay/libay.make new file mode 100755 index 0000000000..9ad661986d --- /dev/null +++ b/apps/codecs/libgme/ay/libay.make
@@ -0,0 +1,21 @@
		1
		2	# libay
		3	AYLIB := $(CODECDIR)/libay.a
		4	AYLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/ay/AYSOURCES)
		5	AYLIB_OBJ := $(call c2obj, $(AYLIB_SRC))
		6	OTHER_SRC += $(AYLIB_SRC)
		7
		8	$(AYLIB): $(AYLIB_OBJ)
		9	$(SILENT)$(shell rm -f $@)
		10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
		11
		12	AYFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_AY_TYPE
		13	ifeq ($(CPU),arm)
		14	AYFLAGS += -O1
		15	else
		16	AYFLAGS += -O2
		17	endif
		18
		19	$(CODECDIR)/libgme/ay/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
		20	$(SILENT)mkdir -p $(dir $@)
		21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(AYFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/emu2413/EMU2413SOURCES b/apps/codecs/libgme/emu2413/EMU2413SOURCES new file mode 100644 index 0000000000..dcde7ea719 --- /dev/null +++ b/apps/codecs/libgme/emu2413/EMU2413SOURCES
@@ -0,0 +1,3 @@
		1	sms_fm_apu.c
		2	ym2413_emu.c
		3	emu2413.c


diff --git a/apps/codecs/libgme/emu2413/libemu2413.make b/apps/codecs/libgme/emu2413/libemu2413.make new file mode 100644 index 0000000000..74f51c7664 --- /dev/null +++ b/apps/codecs/libgme/emu2413/libemu2413.make
@@ -0,0 +1,21 @@
		1
		2	# libemu
		3	EMULIB := $(CODECDIR)/libemu2413.a
		4	EMULIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/emu2413/EMU2413SOURCES)
		5	EMULIB_OBJ := $(call c2obj, $(EMULIB_SRC))
		6	OTHER_SRC += $(EMULIB_SRC)
		7
		8	$(EMULIB): $(EMULIB_OBJ)
		9	$(SILENT)$(shell rm -f $@)
		10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
		11
		12	EMUFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_EMU_TYPE
		13	ifeq ($(CPU),arm)
		14	EMUFLAGS += -O3
		15	else
		16	EMUFLAGS += -O2
		17	endif
		18
		19	$(CODECDIR)/libgme/emu2413/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
		20	$(SILENT)mkdir -p $(dir $@)
		21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(EMUFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/gbs/GBSSOURCES b/apps/codecs/libgme/gbs/GBSSOURCES new file mode 100644 index 0000000000..5548fd85eb --- /dev/null +++ b/apps/codecs/libgme/gbs/GBSSOURCES
@@ -0,0 +1,8 @@
		1	gb_apu.c
		2	gb_cpu.c
		3	gbs_cpu.c
		4	gb_oscs.c
		5	gbs_emu.c
		6	blip_buffer.c
		7	multi_buffer.c
		8	rom_data.c


diff --git a/apps/codecs/libgme/gbs/libgbs.make b/apps/codecs/libgme/gbs/libgbs.make new file mode 100644 index 0000000000..260e0bc324 --- /dev/null +++ b/apps/codecs/libgme/gbs/libgbs.make
@@ -0,0 +1,21 @@
		1
		2	# libgbs
		3	GBSLIB := $(CODECDIR)/libgbs.a
		4	GBSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/gbs/GBSSOURCES)
		5	GBSLIB_OBJ := $(call c2obj, $(GBSLIB_SRC))
		6	OTHER_SRC += $(GBSLIB_SRC)
		7
		8	$(GBSLIB): $(GBSLIB_OBJ)
		9	$(SILENT)$(shell rm -f $@)
		10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
		11
		12	GBSFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_GBS_TYPE
		13	ifeq ($(CPU),arm)
		14	GBSFLAGS += -O1
		15	else
		16	GBSFLAGS += -O2
		17	endif
		18
		19	$(CODECDIR)/libgme/gbs/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
		20	$(SILENT)mkdir -p $(dir $@)
		21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(GBSFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/hes/HESSOURCES b/apps/codecs/libgme/hes/HESSOURCES new file mode 100644 index 0000000000..58a38f2f5a --- /dev/null +++ b/apps/codecs/libgme/hes/HESSOURCES
@@ -0,0 +1,7 @@
		1	hes_apu.c
		2	hes_apu_adpcm.c
		3	hes_cpu.c
		4	hes_emu.c
		5	blip_buffer.c
		6	multi_buffer.c
		7	rom_data.c


diff --git a/apps/codecs/libgme/hes/libhes.make b/apps/codecs/libgme/hes/libhes.make new file mode 100644 index 0000000000..6d89eae248 --- /dev/null +++ b/apps/codecs/libgme/hes/libhes.make
@@ -0,0 +1,21 @@
		1
		2	# libhes
		3	HESLIB := $(CODECDIR)/libhes.a
		4	HESLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/hes/HESSOURCES)
		5	HESLIB_OBJ := $(call c2obj, $(HESLIB_SRC))
		6	OTHER_SRC += $(HESLIB_SRC)
		7
		8	$(HESLIB): $(HESLIB_OBJ)
		9	$(SILENT)$(shell rm -f $@)
		10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
		11
		12	HESFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_HES_TYPE
		13	ifeq ($(CPU),arm)
		14	HESFLAGS += -O1
		15	else
		16	HESFLAGS += -O2
		17	endif
		18
		19	$(CODECDIR)/libgme/hes/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
		20	$(SILENT)mkdir -p $(dir $@)
		21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(HESFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/kss/KSSSOURCES b/apps/codecs/libgme/kss/KSSSOURCES new file mode 100755 index 0000000000..61dd42ad51 --- /dev/null +++ b/apps/codecs/libgme/kss/KSSSOURCES
@@ -0,0 +1,12 @@
		1	ay_apu.c
		2	kss_cpu.c
		3	kss_emu.c
		4	kss_scc_apu.c
		5	opl_apu.c
		6	sms_apu.c
		7	z80_cpu.c
		8	blip_buffer.c
		9	multi_buffer.c
		10	rom_data.c
		11	emu8950.c
		12	emuadpcm.c


diff --git a/apps/codecs/libgme/kss/libkss.make b/apps/codecs/libgme/kss/libkss.make new file mode 100755 index 0000000000..115d28b557 --- /dev/null +++ b/apps/codecs/libgme/kss/libkss.make
@@ -0,0 +1,21 @@
		1
		2	# libkss
		3	KSSLIB := $(CODECDIR)/libkss.a
		4	KSSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/kss/KSSSOURCES)
		5	KSSLIB_OBJ := $(call c2obj, $(KSSLIB_SRC))
		6	OTHER_SRC += $(KSSLIB_SRC)
		7
		8	$(KSSLIB): $(KSSLIB_OBJ)
		9	$(SILENT)$(shell rm -f $@)
		10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
		11
		12	KSSFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_KSS_TYPE
		13	ifeq ($(CPU),arm)
		14	KSSFLAGS += -O1
		15	else
		16	KSSFLAGS += -O2
		17	endif
		18
		19	$(CODECDIR)/libgme/kss/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
		20	$(SILENT)mkdir -p $(dir $@)
		21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(KSSFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/libgbs.make b/apps/codecs/libgme/libgbs.make index cf6ff01274..e69de29bb2 100644 --- a/apps/codecs/libgme/libgbs.make +++ b/apps/codecs/libgme/libgbs.make
@@ -1,21 +0,0 @@
1
2	# libgbs
3	GBSLIB := $(CODECDIR)/libgbs.a
4	GBSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/GBSSOURCES)
5	GBSLIB_OBJ := $(call c2obj, $(GBSLIB_SRC))
6	OTHER_SRC += $(GBSLIB_SRC)
7
8	$(GBSLIB): $(GBSLIB_OBJ)
9	$(SILENT)$(shell rm -f $@)
10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
11
12	GBSFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_GBS_TYPE
13	ifeq ($(CPU),arm)
14	GBSFLAGS += -O3
15	else
16	GBSFLAGS += -O2
17	endif
18
19	$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
20	$(SILENT)mkdir -p $(dir $@)
21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(GBSFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/libhes.make b/apps/codecs/libgme/libhes.make index e0018565fb..e69de29bb2 100644 --- a/apps/codecs/libgme/libhes.make +++ b/apps/codecs/libgme/libhes.make
@@ -1,21 +0,0 @@
1
2	# libhes
3	HESLIB := $(CODECDIR)/libhes.a
4	HESLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/HESSOURCES)
5	HESLIB_OBJ := $(call c2obj, $(HESLIB_SRC))
6	OTHER_SRC += $(HESLIB_SRC)
7
8	$(HESLIB): $(HESLIB_OBJ)
9	$(SILENT)$(shell rm -f $@)
10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
11
12	HESFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_HES_TYPE
13	ifeq ($(CPU),arm)
14	HESFLAGS += -O3
15	else
16	HESFLAGS += -O2
17	endif
18
19	$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
20	$(SILENT)mkdir -p $(dir $@)
21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(HESFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/libkss.make b/apps/codecs/libgme/libkss.make index 0e2dd54bc2..e69de29bb2 100644 --- a/apps/codecs/libgme/libkss.make +++ b/apps/codecs/libgme/libkss.make
@@ -1,21 +0,0 @@
1
2	# libkss
3	KSSLIB := $(CODECDIR)/libkss.a
4	KSSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/KSSSOURCES)
5	KSSLIB_OBJ := $(call c2obj, $(KSSLIB_SRC))
6	OTHER_SRC += $(KSSLIB_SRC)
7
8	$(KSSLIB): $(KSSLIB_OBJ)
9	$(SILENT)$(shell rm -f $@)
10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
11
12	KSSFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_KSS_TYPE
13	ifeq ($(CPU),arm)
14	KSSFLAGS += -O3
15	else
16	KSSFLAGS += -O2
17	endif
18
19	$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
20	$(SILENT)mkdir -p $(dir $@)
21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(KSSFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/libnsf.make b/apps/codecs/libgme/libnsf.make index 8b9df7526f..e69de29bb2 100644 --- a/apps/codecs/libgme/libnsf.make +++ b/apps/codecs/libgme/libnsf.make
@@ -1,21 +0,0 @@
1
2	# libnsf
3	NSFLIB := $(CODECDIR)/libnsf.a
4	NSFLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/NSFSOURCES)
5	NSFLIB_OBJ := $(call c2obj, $(NSFLIB_SRC))
6	OTHER_SRC += $(NSFLIB_SRC)
7
8	$(NSFLIB): $(NSFLIB_OBJ)
9	$(SILENT)$(shell rm -f $@)
10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
11
12	NSFFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_NSF_TYPE
13	ifeq ($(CPU),arm)
14	NSFFLAGS += -O3
15	else
16	NSFFLAGS += -O2
17	endif
18
19	$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
20	$(SILENT)mkdir -p $(dir $@)
21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(NSFFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/libsgc.make b/apps/codecs/libgme/libsgc.make index 0defe788c6..e69de29bb2 100644 --- a/apps/codecs/libgme/libsgc.make +++ b/apps/codecs/libgme/libsgc.make
@@ -1,21 +0,0 @@
1
2	# libsgc
3	SGCLIB := $(CODECDIR)/libsgc.a
4	SGCLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/SGCSOURCES)
5	SGCLIB_OBJ := $(call c2obj, $(SGCLIB_SRC))
6	OTHER_SRC += $(SGCLIB_SRC)
7
8	$(SGCLIB): $(SGCLIB_OBJ)
9	$(SILENT)$(shell rm -f $@)
10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
11
12	SGCFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_SGC_TYPE
13	ifeq ($(CPU),arm)
14	SGCFLAGS += -O3
15	else
16	SGCFLAGS += -O2
17	endif
18
19	$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
20	$(SILENT)mkdir -p $(dir $@)
21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SGCFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/libvgm.make b/apps/codecs/libgme/libvgm.make index f0e7cbb598..e69de29bb2 100644 --- a/apps/codecs/libgme/libvgm.make +++ b/apps/codecs/libgme/libvgm.make
@@ -1,21 +0,0 @@
1
2	# libvgm
3	VGMLIB := $(CODECDIR)/libvgm.a
4	VGMLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/VGMSOURCES)
5	VGMLIB_OBJ := $(call c2obj, $(VGMLIB_SRC))
6	OTHER_SRC += $(VGMLIB_SRC)
7
8	$(VGMLIB): $(VGMLIB_OBJ)
9	$(SILENT)$(shell rm -f $@)
10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
11
12	VGMFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_VGM_TYPE
13	ifeq ($(CPU),arm)
14	VGMFLAGS += -O3
15	else
16	VGMFLAGS += -O2
17	endif
18
19	$(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
20	$(SILENT)mkdir -p $(dir $@)
21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VGMFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/nsf/NSFSOURCES b/apps/codecs/libgme/nsf/NSFSOURCES new file mode 100644 index 0000000000..54b4f82f60 --- /dev/null +++ b/apps/codecs/libgme/nsf/NSFSOURCES
@@ -0,0 +1,14 @@
		1	nes_apu.c
		2	nes_cpu.c
		3	nes_fds_apu.c
		4	nes_fme7_apu.c
		5	nes_namco_apu.c
		6	nes_oscs.c
		7	nes_vrc6_apu.c
		8	nes_vrc7_apu.c
		9	nsf_cpu.c
		10	nsf_emu.c
		11	nsfe_info.c
		12	blip_buffer.c
		13	multi_buffer.c
		14	rom_data.c


diff --git a/apps/codecs/libgme/nsf/libnsf.make b/apps/codecs/libgme/nsf/libnsf.make new file mode 100644 index 0000000000..644aa7408c --- /dev/null +++ b/apps/codecs/libgme/nsf/libnsf.make
@@ -0,0 +1,21 @@
		1
		2	# libnsf
		3	NSFLIB := $(CODECDIR)/libnsf.a
		4	NSFLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/nsf/NSFSOURCES)
		5	NSFLIB_OBJ := $(call c2obj, $(NSFLIB_SRC))
		6	OTHER_SRC += $(NSFLIB_SRC)
		7
		8	$(NSFLIB): $(NSFLIB_OBJ)
		9	$(SILENT)$(shell rm -f $@)
		10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
		11
		12	NSFFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_NSF_TYPE
		13	ifeq ($(CPU),arm)
		14	NSFFLAGS += -O1
		15	else
		16	NSFFLAGS += -O2
		17	endif
		18
		19	$(CODECDIR)/libgme/nsf/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
		20	$(SILENT)mkdir -p $(dir $@)
		21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(NSFFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/sgc/SGCSOURCES b/apps/codecs/libgme/sgc/SGCSOURCES new file mode 100644 index 0000000000..624d1cb897 --- /dev/null +++ b/apps/codecs/libgme/sgc/SGCSOURCES
@@ -0,0 +1,7 @@
		1	sgc_cpu.c
		2	sgc_emu.c
		3	sms_apu.c
		4	z80_cpu.c
		5	blip_buffer.c
		6	multi_buffer.c
		7	rom_data.c


diff --git a/apps/codecs/libgme/sgc/libsgc.make b/apps/codecs/libgme/sgc/libsgc.make new file mode 100644 index 0000000000..6984cdc4bb --- /dev/null +++ b/apps/codecs/libgme/sgc/libsgc.make
@@ -0,0 +1,21 @@
		1
		2	# libsgc
		3	SGCLIB := $(CODECDIR)/libsgc.a
		4	SGCLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/sgc/SGCSOURCES)
		5	SGCLIB_OBJ := $(call c2obj, $(SGCLIB_SRC))
		6	OTHER_SRC += $(SGCLIB_SRC)
		7
		8	$(SGCLIB): $(SGCLIB_OBJ)
		9	$(SILENT)$(shell rm -f $@)
		10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
		11
		12	SGCFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_SGC_TYPE
		13	ifeq ($(CPU),arm)
		14	SGCFLAGS += -O1
		15	else
		16	SGCFLAGS += -O2
		17	endif
		18
		19	$(CODECDIR)/libgme/sgc/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
		20	$(SILENT)mkdir -p $(dir $@)
		21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SGCFLAGS) -c $< -o $@


diff --git a/apps/codecs/libgme/vgm/VGMSOURCES b/apps/codecs/libgme/vgm/VGMSOURCES new file mode 100644 index 0000000000..32a8b356a1 --- /dev/null +++ b/apps/codecs/libgme/vgm/VGMSOURCES
@@ -0,0 +1,10 @@
		1	blip_buffer.c
		2	multi_buffer.c
		3	resampler.c
		4	sms_apu.c
		5	vgm_emu.c
		6	ym2612_emu.c
		7	inflate/bbfuncs.c
		8	inflate/inflate.c
		9	inflate/mallocer.c
		10	inflate/mbreader.c


diff --git a/apps/codecs/libgme/vgm/libvgm.make b/apps/codecs/libgme/vgm/libvgm.make new file mode 100644 index 0000000000..2ff7f94fab --- /dev/null +++ b/apps/codecs/libgme/vgm/libvgm.make
@@ -0,0 +1,21 @@
		1
		2	# libvgm
		3	VGMLIB := $(CODECDIR)/libvgm.a
		4	VGMLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/vgm/VGMSOURCES)
		5	VGMLIB_OBJ := $(call c2obj, $(VGMLIB_SRC))
		6	OTHER_SRC += $(VGMLIB_SRC)
		7
		8	$(VGMLIB): $(VGMLIB_OBJ)
		9	$(SILENT)$(shell rm -f $@)
		10	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
		11
		12	VGMFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_VGM_TYPE
		13	ifeq ($(CPU),arm)
		14	VGMFLAGS += -O1
		15	else
		16	VGMFLAGS += -O2
		17	endif
		18
		19	$(CODECDIR)/libgme/vgm/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c
		20	$(SILENT)mkdir -p $(dir $@)
		21	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VGMFLAGS) -c $< -o $@