diff --git a/Makefile.am b/Makefile.am index 3af702c..3946475 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,17 +35,17 @@ endif endif if BOXTYPE_SPARK #libstb_hal_test_LDADD += -lasound -SUBDIRS += libspark libeplayer3 +SUBDIRS += libspark libeplayer3-sh4 libstb_hal_la_LIBADD += \ libspark/libspark.la \ - libeplayer3/libeplayer3.la + libeplayer3-sh4/libeplayer3_sh4.la endif if BOXTYPE_DUCKBOX #libstb_hal_test_LDADD += -lasound -SUBDIRS += libduckbox libeplayer3 libdvbci +SUBDIRS += libduckbox libeplayer3-sh4 libdvbci libstb_hal_la_LIBADD += \ libduckbox/libduckbox.la \ - libeplayer3/libeplayer3.la \ + libeplayer3-sh4/libeplayer3_sh4.la \ libdvbci/libdvbci.la endif if BOXTYPE_ARMBOX diff --git a/configure.ac b/configure.ac index 127c078..612135e 100644 --- a/configure.ac +++ b/configure.ac @@ -112,8 +112,8 @@ libarmbox/Makefile libazbox/Makefile libduckbox/Makefile libdvbci/Makefile -libeplayer3/Makefile libeplayer3-arm/Makefile +libeplayer3-sh4/Makefile libgeneric-pc/Makefile libraspi/Makefile libspark/Makefile diff --git a/libeplayer3/Makefile.am b/libeplayer3-sh4/Makefile.am similarity index 84% rename from libeplayer3/Makefile.am rename to libeplayer3-sh4/Makefile.am index 814d106..d129566 100644 --- a/libeplayer3/Makefile.am +++ b/libeplayer3-sh4/Makefile.am @@ -1,13 +1,13 @@ AUTOMAKE_OPTIONS = subdir-objects -noinst_LTLIBRARIES = libeplayer3.la +noinst_LTLIBRARIES = libeplayer3_sh4.la AM_CPPFLAGS = -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS AM_CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE AM_CPPFLAGS += -I$(srcdir)/include AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing -libeplayer3_la_SOURCES = \ +libeplayer3_sh4_la_SOURCES = \ input.cpp output.cpp manager.cpp player.cpp \ writer/writer.cpp \ writer/pes.cpp \ @@ -18,6 +18,6 @@ libeplayer3_la_SOURCES = \ # writer/h264.cpp # writer/h263.cpp writer/vc1.cpp writer/pcm.cpp writer/aac.cpp -LIBEPLAYER3_LIBS = libeplayer3.la +LIBEPLAYER3_LIBS = libeplayer3_sh4.la # -lpthread -lavformat -lavcodec -lavutil -lswresample -lm diff --git a/libeplayer3/README b/libeplayer3-sh4/README similarity index 100% rename from libeplayer3/README rename to libeplayer3-sh4/README diff --git a/libeplayer3/include/input.h b/libeplayer3-sh4/include/input.h similarity index 100% rename from libeplayer3/include/input.h rename to libeplayer3-sh4/include/input.h diff --git a/libeplayer3/include/manager.h b/libeplayer3-sh4/include/manager.h similarity index 100% rename from libeplayer3/include/manager.h rename to libeplayer3-sh4/include/manager.h diff --git a/libeplayer3/include/misc.h b/libeplayer3-sh4/include/misc.h similarity index 100% rename from libeplayer3/include/misc.h rename to libeplayer3-sh4/include/misc.h diff --git a/libeplayer3/include/output.h b/libeplayer3-sh4/include/output.h similarity index 100% rename from libeplayer3/include/output.h rename to libeplayer3-sh4/include/output.h diff --git a/libeplayer3/include/pes.h b/libeplayer3-sh4/include/pes.h similarity index 100% rename from libeplayer3/include/pes.h rename to libeplayer3-sh4/include/pes.h diff --git a/libeplayer3/include/player.h b/libeplayer3-sh4/include/player.h similarity index 100% rename from libeplayer3/include/player.h rename to libeplayer3-sh4/include/player.h diff --git a/libeplayer3/include/writer.h b/libeplayer3-sh4/include/writer.h similarity index 100% rename from libeplayer3/include/writer.h rename to libeplayer3-sh4/include/writer.h diff --git a/libeplayer3/input.cpp b/libeplayer3-sh4/input.cpp similarity index 100% rename from libeplayer3/input.cpp rename to libeplayer3-sh4/input.cpp diff --git a/libeplayer3/manager.cpp b/libeplayer3-sh4/manager.cpp similarity index 100% rename from libeplayer3/manager.cpp rename to libeplayer3-sh4/manager.cpp diff --git a/libeplayer3/output.cpp b/libeplayer3-sh4/output.cpp similarity index 100% rename from libeplayer3/output.cpp rename to libeplayer3-sh4/output.cpp diff --git a/libeplayer3/player.cpp b/libeplayer3-sh4/player.cpp similarity index 100% rename from libeplayer3/player.cpp rename to libeplayer3-sh4/player.cpp diff --git a/libeplayer3/writer/aac.cpp b/libeplayer3-sh4/writer/aac.cpp similarity index 100% rename from libeplayer3/writer/aac.cpp rename to libeplayer3-sh4/writer/aac.cpp diff --git a/libeplayer3/writer/ac3.cpp b/libeplayer3-sh4/writer/ac3.cpp similarity index 100% rename from libeplayer3/writer/ac3.cpp rename to libeplayer3-sh4/writer/ac3.cpp diff --git a/libeplayer3/writer/divx.cpp b/libeplayer3-sh4/writer/divx.cpp similarity index 100% rename from libeplayer3/writer/divx.cpp rename to libeplayer3-sh4/writer/divx.cpp diff --git a/libeplayer3/writer/dts.cpp b/libeplayer3-sh4/writer/dts.cpp similarity index 100% rename from libeplayer3/writer/dts.cpp rename to libeplayer3-sh4/writer/dts.cpp diff --git a/libeplayer3/writer/h263.cpp b/libeplayer3-sh4/writer/h263.cpp similarity index 100% rename from libeplayer3/writer/h263.cpp rename to libeplayer3-sh4/writer/h263.cpp diff --git a/libeplayer3/writer/h264.cpp b/libeplayer3-sh4/writer/h264.cpp similarity index 100% rename from libeplayer3/writer/h264.cpp rename to libeplayer3-sh4/writer/h264.cpp diff --git a/libeplayer3/writer/misc.cpp b/libeplayer3-sh4/writer/misc.cpp similarity index 100% rename from libeplayer3/writer/misc.cpp rename to libeplayer3-sh4/writer/misc.cpp diff --git a/libeplayer3/writer/mp3.cpp b/libeplayer3-sh4/writer/mp3.cpp similarity index 100% rename from libeplayer3/writer/mp3.cpp rename to libeplayer3-sh4/writer/mp3.cpp diff --git a/libeplayer3/writer/mpeg2.cpp b/libeplayer3-sh4/writer/mpeg2.cpp similarity index 100% rename from libeplayer3/writer/mpeg2.cpp rename to libeplayer3-sh4/writer/mpeg2.cpp diff --git a/libeplayer3/writer/pcm.cpp b/libeplayer3-sh4/writer/pcm.cpp similarity index 100% rename from libeplayer3/writer/pcm.cpp rename to libeplayer3-sh4/writer/pcm.cpp diff --git a/libeplayer3/writer/pes.cpp b/libeplayer3-sh4/writer/pes.cpp similarity index 100% rename from libeplayer3/writer/pes.cpp rename to libeplayer3-sh4/writer/pes.cpp diff --git a/libeplayer3/writer/vc1.cpp b/libeplayer3-sh4/writer/vc1.cpp similarity index 100% rename from libeplayer3/writer/vc1.cpp rename to libeplayer3-sh4/writer/vc1.cpp diff --git a/libeplayer3/writer/wmv.cpp b/libeplayer3-sh4/writer/wmv.cpp similarity index 100% rename from libeplayer3/writer/wmv.cpp rename to libeplayer3-sh4/writer/wmv.cpp diff --git a/libeplayer3/writer/writer.cpp b/libeplayer3-sh4/writer/writer.cpp similarity index 100% rename from libeplayer3/writer/writer.cpp rename to libeplayer3-sh4/writer/writer.cpp