1
0
Fork 0
forked from len0rd/rockbox

Roll back r30328. Sorry for any inconvenience.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30329 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-08-18 15:17:25 +00:00
parent 1466519bd8
commit 46d7fb9b4a
30 changed files with 208 additions and 247 deletions

View file

@ -43,14 +43,13 @@ include $(APPSDIR)/codecs/librm/librm.make
include $(APPSDIR)/codecs/libatrac/libatrac.make include $(APPSDIR)/codecs/libatrac/libatrac.make
include $(APPSDIR)/codecs/libpcm/libpcm.make include $(APPSDIR)/codecs/libpcm/libpcm.make
include $(APPSDIR)/codecs/libtta/libtta.make include $(APPSDIR)/codecs/libtta/libtta.make
include $(APPSDIR)/codecs/libgme/ay/libay.make include $(APPSDIR)/codecs/libgme/libay.make
include $(APPSDIR)/codecs/libgme/gbs/libgbs.make include $(APPSDIR)/codecs/libgme/libgbs.make
include $(APPSDIR)/codecs/libgme/hes/libhes.make include $(APPSDIR)/codecs/libgme/libhes.make
include $(APPSDIR)/codecs/libgme/nsf/libnsf.make include $(APPSDIR)/codecs/libgme/libnsf.make
include $(APPSDIR)/codecs/libgme/sgc/libsgc.make include $(APPSDIR)/codecs/libgme/libsgc.make
include $(APPSDIR)/codecs/libgme/vgm/libvgm.make include $(APPSDIR)/codecs/libgme/libvgm.make
include $(APPSDIR)/codecs/libgme/kss/libkss.make include $(APPSDIR)/codecs/libgme/libkss.make
include $(APPSDIR)/codecs/libgme/emu2413/libemu2413.make
# compile flags for codecs # compile flags for codecs
CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \ CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \
@ -104,10 +103,10 @@ $(CODECDIR)/tta.codec : $(CODECDIR)/libtta.a
$(CODECDIR)/ay.codec : $(CODECDIR)/libay.a $(CODECDIR)/ay.codec : $(CODECDIR)/libay.a
$(CODECDIR)/gbs.codec : $(CODECDIR)/libgbs.a $(CODECDIR)/gbs.codec : $(CODECDIR)/libgbs.a
$(CODECDIR)/hes.codec : $(CODECDIR)/libhes.a $(CODECDIR)/hes.codec : $(CODECDIR)/libhes.a
$(CODECDIR)/nsf.codec : $(CODECDIR)/libnsf.a $(CODECDIR)/libemu2413.a $(CODECDIR)/nsf.codec : $(CODECDIR)/libnsf.a
$(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a $(CODECDIR)/libemu2413.a $(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a
$(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a $(CODECDIR)/libemu2413.a $(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a
$(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a $(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a
$(CODECS): $(CODECLIB) # this must be last in codec dependency list $(CODECS): $(CODECLIB) # this must be last in codec dependency list

View file

@ -0,0 +1,6 @@
ay_apu.c
ay_cpu.c
ay_emu.c
blip_buffer.c
multi_buffer.c
z80_cpu.c

View file

@ -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

View file

@ -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

View file

@ -0,0 +1,13 @@
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

View file

@ -0,0 +1,15 @@
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

View file

@ -0,0 +1,10 @@
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

View file

@ -0,0 +1,12 @@
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

View file

@ -1,6 +0,0 @@
ay_apu.c
ay_cpu.c
ay_emu.c
blip_buffer.c
multi_buffer.c
z80_cpu.c

View file

@ -1,21 +0,0 @@
# 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 $@

View file

@ -1,3 +0,0 @@
sms_fm_apu.c
ym2413_emu.c
emu2413.c

View file

@ -1,21 +0,0 @@
# 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 $@

View file

@ -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

View file

@ -1,21 +0,0 @@
# 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 $@

View file

@ -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

View file

@ -1,21 +0,0 @@
# 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 $@

View file

@ -1,12 +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
emu8950.c
emuadpcm.c

View file

@ -1,21 +0,0 @@
# 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 $@

View file

@ -0,0 +1,21 @@
# 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 $@

View file

@ -0,0 +1,21 @@
# 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 $@

View file

@ -0,0 +1,21 @@
# 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 $@

View file

@ -0,0 +1,21 @@
# 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 $@

View file

@ -0,0 +1,21 @@
# 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 $@

View file

@ -0,0 +1,21 @@
# 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 $@

View file

@ -1,14 +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

View file

@ -1,21 +0,0 @@
# 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 $@

View file

@ -1,7 +0,0 @@
sgc_cpu.c
sgc_emu.c
sms_apu.c
z80_cpu.c
blip_buffer.c
multi_buffer.c
rom_data.c

View file

@ -1,21 +0,0 @@
# 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 $@

View file

@ -1,10 +0,0 @@
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

View file

@ -1,21 +0,0 @@
# 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 $@