From d112fdd1d22f208b08afe4c7812804d3e7faab24 Mon Sep 17 00:00:00 2001 From: Martin Natano Date: Mon, 30 May 2022 00:08:14 +0200 Subject: [PATCH] Rename libmad directory --- .gitignore | 2 - extern/CMakeProject-mad.cmake | 70 +++++++++---------- extern/{mad-0.15.1b => libmad}/CHANGES | 0 extern/{mad-0.15.1b => libmad}/COPYING | 0 extern/{mad-0.15.1b => libmad}/COPYRIGHT | 0 extern/{mad-0.15.1b => libmad}/CREDITS | 0 extern/{mad-0.15.1b => libmad}/D.dat | 0 extern/{mad-0.15.1b => libmad}/INSTALL | 0 extern/{mad-0.15.1b => libmad}/Makefile.am | 0 extern/{mad-0.15.1b => libmad}/README | 0 extern/{mad-0.15.1b => libmad}/TODO | 0 extern/{mad-0.15.1b => libmad}/VERSION.txt | 0 extern/{mad-0.15.1b => libmad}/bit.c | 0 extern/{mad-0.15.1b => libmad}/bit.h | 0 extern/{mad-0.15.1b => libmad}/config.guess | 0 extern/{mad-0.15.1b => libmad}/config.h.in | 0 extern/{mad-0.15.1b => libmad}/config.sub | 0 extern/{mad-0.15.1b => libmad}/configure.ac | 0 extern/{mad-0.15.1b => libmad}/decoder.c | 0 extern/{mad-0.15.1b => libmad}/decoder.h | 0 extern/{mad-0.15.1b => libmad}/depcomp | 0 extern/{mad-0.15.1b => libmad}/fixed.c | 0 extern/{mad-0.15.1b => libmad}/fixed.h | 0 extern/{mad-0.15.1b => libmad}/frame.c | 0 extern/{mad-0.15.1b => libmad}/frame.h | 0 extern/{mad-0.15.1b => libmad}/global.h | 0 extern/{mad-0.15.1b => libmad}/huffman.c | 0 extern/{mad-0.15.1b => libmad}/huffman.h | 0 extern/{mad-0.15.1b => libmad}/imdct_l_arm.S | 0 extern/{mad-0.15.1b => libmad}/imdct_s.dat | 0 extern/{mad-0.15.1b => libmad}/install-sh | 0 extern/{mad-0.15.1b => libmad}/layer12.c | 0 extern/{mad-0.15.1b => libmad}/layer12.h | 0 extern/{mad-0.15.1b => libmad}/layer3.c | 0 extern/{mad-0.15.1b => libmad}/layer3.h | 0 extern/{mad-0.15.1b => libmad}/libmad.list.in | 0 extern/{mad-0.15.1b => libmad}/ltmain.sh | 0 extern/{mad-0.15.1b => libmad}/mad.h | 0 extern/{mad-0.15.1b => libmad}/mad.h.sed | 0 extern/{mad-0.15.1b => libmad}/minimad.c | 0 extern/{mad-0.15.1b => libmad}/missing | 0 extern/{mad-0.15.1b => libmad}/mkinstalldirs | 0 extern/{mad-0.15.1b => libmad}/qc_table.dat | 0 extern/{mad-0.15.1b => libmad}/rq_table.dat | 0 extern/{mad-0.15.1b => libmad}/sf_table.dat | 0 extern/{mad-0.15.1b => libmad}/stream.c | 0 extern/{mad-0.15.1b => libmad}/stream.h | 0 extern/{mad-0.15.1b => libmad}/synth.c | 0 extern/{mad-0.15.1b => libmad}/synth.h | 0 extern/{mad-0.15.1b => libmad}/timer.c | 0 extern/{mad-0.15.1b => libmad}/timer.h | 0 extern/{mad-0.15.1b => libmad}/version.c | 0 extern/{mad-0.15.1b => libmad}/version.h | 0 53 files changed, 33 insertions(+), 39 deletions(-) rename extern/{mad-0.15.1b => libmad}/CHANGES (100%) rename extern/{mad-0.15.1b => libmad}/COPYING (100%) rename extern/{mad-0.15.1b => libmad}/COPYRIGHT (100%) rename extern/{mad-0.15.1b => libmad}/CREDITS (100%) rename extern/{mad-0.15.1b => libmad}/D.dat (100%) rename extern/{mad-0.15.1b => libmad}/INSTALL (100%) rename extern/{mad-0.15.1b => libmad}/Makefile.am (100%) rename extern/{mad-0.15.1b => libmad}/README (100%) rename extern/{mad-0.15.1b => libmad}/TODO (100%) rename extern/{mad-0.15.1b => libmad}/VERSION.txt (100%) rename extern/{mad-0.15.1b => libmad}/bit.c (100%) rename extern/{mad-0.15.1b => libmad}/bit.h (100%) rename extern/{mad-0.15.1b => libmad}/config.guess (100%) rename extern/{mad-0.15.1b => libmad}/config.h.in (100%) rename extern/{mad-0.15.1b => libmad}/config.sub (100%) rename extern/{mad-0.15.1b => libmad}/configure.ac (100%) rename extern/{mad-0.15.1b => libmad}/decoder.c (100%) rename extern/{mad-0.15.1b => libmad}/decoder.h (100%) rename extern/{mad-0.15.1b => libmad}/depcomp (100%) rename extern/{mad-0.15.1b => libmad}/fixed.c (100%) rename extern/{mad-0.15.1b => libmad}/fixed.h (100%) rename extern/{mad-0.15.1b => libmad}/frame.c (100%) rename extern/{mad-0.15.1b => libmad}/frame.h (100%) rename extern/{mad-0.15.1b => libmad}/global.h (100%) rename extern/{mad-0.15.1b => libmad}/huffman.c (100%) rename extern/{mad-0.15.1b => libmad}/huffman.h (100%) rename extern/{mad-0.15.1b => libmad}/imdct_l_arm.S (100%) rename extern/{mad-0.15.1b => libmad}/imdct_s.dat (100%) rename extern/{mad-0.15.1b => libmad}/install-sh (100%) rename extern/{mad-0.15.1b => libmad}/layer12.c (100%) rename extern/{mad-0.15.1b => libmad}/layer12.h (100%) rename extern/{mad-0.15.1b => libmad}/layer3.c (100%) rename extern/{mad-0.15.1b => libmad}/layer3.h (100%) rename extern/{mad-0.15.1b => libmad}/libmad.list.in (100%) rename extern/{mad-0.15.1b => libmad}/ltmain.sh (100%) rename extern/{mad-0.15.1b => libmad}/mad.h (100%) rename extern/{mad-0.15.1b => libmad}/mad.h.sed (100%) rename extern/{mad-0.15.1b => libmad}/minimad.c (100%) rename extern/{mad-0.15.1b => libmad}/missing (100%) rename extern/{mad-0.15.1b => libmad}/mkinstalldirs (100%) rename extern/{mad-0.15.1b => libmad}/qc_table.dat (100%) rename extern/{mad-0.15.1b => libmad}/rq_table.dat (100%) rename extern/{mad-0.15.1b => libmad}/sf_table.dat (100%) rename extern/{mad-0.15.1b => libmad}/stream.c (100%) rename extern/{mad-0.15.1b => libmad}/stream.h (100%) rename extern/{mad-0.15.1b => libmad}/synth.c (100%) rename extern/{mad-0.15.1b => libmad}/synth.h (100%) rename extern/{mad-0.15.1b => libmad}/timer.c (100%) rename extern/{mad-0.15.1b => libmad}/timer.h (100%) rename extern/{mad-0.15.1b => libmad}/version.c (100%) rename extern/{mad-0.15.1b => libmad}/version.h (100%) diff --git a/.gitignore b/.gitignore index ffdac0c749..687f63d17f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,8 +18,6 @@ Build/ !Build/README.md verdata.* src/generated -extern/mad-0.15.1b/config.h -extern/libjpeg/jconfig.h # Text Editor Based Items ___* diff --git a/extern/CMakeProject-mad.cmake b/extern/CMakeProject-mad.cmake index ac2b30c804..8986c17b64 100644 --- a/extern/CMakeProject-mad.cmake +++ b/extern/CMakeProject-mad.cmake @@ -1,43 +1,38 @@ if(WITH_SYSTEM_MAD) find_package(Mad REQUIRED) else() - set(MAD_DIR "${SM_EXTERN_DIR}/mad-0.15.1b") + set(MAD_SRC "libmad/bit.c" + "libmad/decoder.c" + "libmad/fixed.c" + "libmad/frame.c" + "libmad/huffman.c" + "libmad/layer12.c" + "libmad/layer3.c" + "libmad/stream.c" + "libmad/synth.c" + "libmad/timer.c" + "libmad/version.c") - list(APPEND MAD_SRC - "${MAD_DIR}/bit.c" - "${MAD_DIR}/decoder.c" - "${MAD_DIR}/fixed.c" - "${MAD_DIR}/frame.c" - "${MAD_DIR}/huffman.c" - "${MAD_DIR}/layer12.c" - "${MAD_DIR}/layer3.c" - "${MAD_DIR}/stream.c" - "${MAD_DIR}/synth.c" - "${MAD_DIR}/timer.c" - "${MAD_DIR}/version.c") + set(MAD_HPP "libmad/bit.h" + "libmad/config.h" + "libmad/decoder.h" + "libmad/fixed.h" + "libmad/frame.h" + "libmad/global.h" + "libmad/huffman.h" + "libmad/layer12.h" + "libmad/layer3.h" + "libmad/mad.h" + "libmad/stream.h" + "libmad/synth.h" + "libmad/timer.h" + "libmad/version.h") - list(APPEND MAD_HPP - "${MAD_DIR}/bit.h" - "${MAD_DIR}/config.h" - "${MAD_DIR}/decoder.h" - "${MAD_DIR}/fixed.h" - "${MAD_DIR}/frame.h" - "${MAD_DIR}/global.h" - "${MAD_DIR}/huffman.h" - "${MAD_DIR}/layer12.h" - "${MAD_DIR}/layer3.h" - "${MAD_DIR}/mad.h" - "${MAD_DIR}/stream.h" - "${MAD_DIR}/synth.h" - "${MAD_DIR}/timer.h" - "${MAD_DIR}/version.h") - - list(APPEND MAD_DAT - "${MAD_DIR}/D.dat" - "${MAD_DIR}/imdct_s.dat" - "${MAD_DIR}/qc_table.dat" - "${MAD_DIR}/rq_table.dat" - "${MAD_DIR}/sf_table.dat") + set(MAD_DAT "libmad/D.dat" + "libmad/imdct_s.dat" + "libmad/qc_table.dat" + "libmad/rq_table.dat" + "libmad/sf_table.dat") source_group("Source Files" FILES ${MAD_SRC}) source_group("Header Files" FILES ${MAD_HPP}) @@ -77,7 +72,8 @@ else() target_compile_definitions("mad" PRIVATE FPM_64BIT=1) endif(MSVC) - target_include_directories("mad" PUBLIC "${MAD_DIR}") + target_include_directories("mad" PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/libmad") + target_include_directories("mad" PUBLIC "libmad") - configure_file("${SM_EXTERN_DIR}/config.mad.in.h" "${MAD_DIR}/config.h") + configure_file("config.mad.in.h" "libmad/config.h") endif() diff --git a/extern/mad-0.15.1b/CHANGES b/extern/libmad/CHANGES similarity index 100% rename from extern/mad-0.15.1b/CHANGES rename to extern/libmad/CHANGES diff --git a/extern/mad-0.15.1b/COPYING b/extern/libmad/COPYING similarity index 100% rename from extern/mad-0.15.1b/COPYING rename to extern/libmad/COPYING diff --git a/extern/mad-0.15.1b/COPYRIGHT b/extern/libmad/COPYRIGHT similarity index 100% rename from extern/mad-0.15.1b/COPYRIGHT rename to extern/libmad/COPYRIGHT diff --git a/extern/mad-0.15.1b/CREDITS b/extern/libmad/CREDITS similarity index 100% rename from extern/mad-0.15.1b/CREDITS rename to extern/libmad/CREDITS diff --git a/extern/mad-0.15.1b/D.dat b/extern/libmad/D.dat similarity index 100% rename from extern/mad-0.15.1b/D.dat rename to extern/libmad/D.dat diff --git a/extern/mad-0.15.1b/INSTALL b/extern/libmad/INSTALL similarity index 100% rename from extern/mad-0.15.1b/INSTALL rename to extern/libmad/INSTALL diff --git a/extern/mad-0.15.1b/Makefile.am b/extern/libmad/Makefile.am similarity index 100% rename from extern/mad-0.15.1b/Makefile.am rename to extern/libmad/Makefile.am diff --git a/extern/mad-0.15.1b/README b/extern/libmad/README similarity index 100% rename from extern/mad-0.15.1b/README rename to extern/libmad/README diff --git a/extern/mad-0.15.1b/TODO b/extern/libmad/TODO similarity index 100% rename from extern/mad-0.15.1b/TODO rename to extern/libmad/TODO diff --git a/extern/mad-0.15.1b/VERSION.txt b/extern/libmad/VERSION.txt similarity index 100% rename from extern/mad-0.15.1b/VERSION.txt rename to extern/libmad/VERSION.txt diff --git a/extern/mad-0.15.1b/bit.c b/extern/libmad/bit.c similarity index 100% rename from extern/mad-0.15.1b/bit.c rename to extern/libmad/bit.c diff --git a/extern/mad-0.15.1b/bit.h b/extern/libmad/bit.h similarity index 100% rename from extern/mad-0.15.1b/bit.h rename to extern/libmad/bit.h diff --git a/extern/mad-0.15.1b/config.guess b/extern/libmad/config.guess similarity index 100% rename from extern/mad-0.15.1b/config.guess rename to extern/libmad/config.guess diff --git a/extern/mad-0.15.1b/config.h.in b/extern/libmad/config.h.in similarity index 100% rename from extern/mad-0.15.1b/config.h.in rename to extern/libmad/config.h.in diff --git a/extern/mad-0.15.1b/config.sub b/extern/libmad/config.sub similarity index 100% rename from extern/mad-0.15.1b/config.sub rename to extern/libmad/config.sub diff --git a/extern/mad-0.15.1b/configure.ac b/extern/libmad/configure.ac similarity index 100% rename from extern/mad-0.15.1b/configure.ac rename to extern/libmad/configure.ac diff --git a/extern/mad-0.15.1b/decoder.c b/extern/libmad/decoder.c similarity index 100% rename from extern/mad-0.15.1b/decoder.c rename to extern/libmad/decoder.c diff --git a/extern/mad-0.15.1b/decoder.h b/extern/libmad/decoder.h similarity index 100% rename from extern/mad-0.15.1b/decoder.h rename to extern/libmad/decoder.h diff --git a/extern/mad-0.15.1b/depcomp b/extern/libmad/depcomp similarity index 100% rename from extern/mad-0.15.1b/depcomp rename to extern/libmad/depcomp diff --git a/extern/mad-0.15.1b/fixed.c b/extern/libmad/fixed.c similarity index 100% rename from extern/mad-0.15.1b/fixed.c rename to extern/libmad/fixed.c diff --git a/extern/mad-0.15.1b/fixed.h b/extern/libmad/fixed.h similarity index 100% rename from extern/mad-0.15.1b/fixed.h rename to extern/libmad/fixed.h diff --git a/extern/mad-0.15.1b/frame.c b/extern/libmad/frame.c similarity index 100% rename from extern/mad-0.15.1b/frame.c rename to extern/libmad/frame.c diff --git a/extern/mad-0.15.1b/frame.h b/extern/libmad/frame.h similarity index 100% rename from extern/mad-0.15.1b/frame.h rename to extern/libmad/frame.h diff --git a/extern/mad-0.15.1b/global.h b/extern/libmad/global.h similarity index 100% rename from extern/mad-0.15.1b/global.h rename to extern/libmad/global.h diff --git a/extern/mad-0.15.1b/huffman.c b/extern/libmad/huffman.c similarity index 100% rename from extern/mad-0.15.1b/huffman.c rename to extern/libmad/huffman.c diff --git a/extern/mad-0.15.1b/huffman.h b/extern/libmad/huffman.h similarity index 100% rename from extern/mad-0.15.1b/huffman.h rename to extern/libmad/huffman.h diff --git a/extern/mad-0.15.1b/imdct_l_arm.S b/extern/libmad/imdct_l_arm.S similarity index 100% rename from extern/mad-0.15.1b/imdct_l_arm.S rename to extern/libmad/imdct_l_arm.S diff --git a/extern/mad-0.15.1b/imdct_s.dat b/extern/libmad/imdct_s.dat similarity index 100% rename from extern/mad-0.15.1b/imdct_s.dat rename to extern/libmad/imdct_s.dat diff --git a/extern/mad-0.15.1b/install-sh b/extern/libmad/install-sh similarity index 100% rename from extern/mad-0.15.1b/install-sh rename to extern/libmad/install-sh diff --git a/extern/mad-0.15.1b/layer12.c b/extern/libmad/layer12.c similarity index 100% rename from extern/mad-0.15.1b/layer12.c rename to extern/libmad/layer12.c diff --git a/extern/mad-0.15.1b/layer12.h b/extern/libmad/layer12.h similarity index 100% rename from extern/mad-0.15.1b/layer12.h rename to extern/libmad/layer12.h diff --git a/extern/mad-0.15.1b/layer3.c b/extern/libmad/layer3.c similarity index 100% rename from extern/mad-0.15.1b/layer3.c rename to extern/libmad/layer3.c diff --git a/extern/mad-0.15.1b/layer3.h b/extern/libmad/layer3.h similarity index 100% rename from extern/mad-0.15.1b/layer3.h rename to extern/libmad/layer3.h diff --git a/extern/mad-0.15.1b/libmad.list.in b/extern/libmad/libmad.list.in similarity index 100% rename from extern/mad-0.15.1b/libmad.list.in rename to extern/libmad/libmad.list.in diff --git a/extern/mad-0.15.1b/ltmain.sh b/extern/libmad/ltmain.sh similarity index 100% rename from extern/mad-0.15.1b/ltmain.sh rename to extern/libmad/ltmain.sh diff --git a/extern/mad-0.15.1b/mad.h b/extern/libmad/mad.h similarity index 100% rename from extern/mad-0.15.1b/mad.h rename to extern/libmad/mad.h diff --git a/extern/mad-0.15.1b/mad.h.sed b/extern/libmad/mad.h.sed similarity index 100% rename from extern/mad-0.15.1b/mad.h.sed rename to extern/libmad/mad.h.sed diff --git a/extern/mad-0.15.1b/minimad.c b/extern/libmad/minimad.c similarity index 100% rename from extern/mad-0.15.1b/minimad.c rename to extern/libmad/minimad.c diff --git a/extern/mad-0.15.1b/missing b/extern/libmad/missing similarity index 100% rename from extern/mad-0.15.1b/missing rename to extern/libmad/missing diff --git a/extern/mad-0.15.1b/mkinstalldirs b/extern/libmad/mkinstalldirs similarity index 100% rename from extern/mad-0.15.1b/mkinstalldirs rename to extern/libmad/mkinstalldirs diff --git a/extern/mad-0.15.1b/qc_table.dat b/extern/libmad/qc_table.dat similarity index 100% rename from extern/mad-0.15.1b/qc_table.dat rename to extern/libmad/qc_table.dat diff --git a/extern/mad-0.15.1b/rq_table.dat b/extern/libmad/rq_table.dat similarity index 100% rename from extern/mad-0.15.1b/rq_table.dat rename to extern/libmad/rq_table.dat diff --git a/extern/mad-0.15.1b/sf_table.dat b/extern/libmad/sf_table.dat similarity index 100% rename from extern/mad-0.15.1b/sf_table.dat rename to extern/libmad/sf_table.dat diff --git a/extern/mad-0.15.1b/stream.c b/extern/libmad/stream.c similarity index 100% rename from extern/mad-0.15.1b/stream.c rename to extern/libmad/stream.c diff --git a/extern/mad-0.15.1b/stream.h b/extern/libmad/stream.h similarity index 100% rename from extern/mad-0.15.1b/stream.h rename to extern/libmad/stream.h diff --git a/extern/mad-0.15.1b/synth.c b/extern/libmad/synth.c similarity index 100% rename from extern/mad-0.15.1b/synth.c rename to extern/libmad/synth.c diff --git a/extern/mad-0.15.1b/synth.h b/extern/libmad/synth.h similarity index 100% rename from extern/mad-0.15.1b/synth.h rename to extern/libmad/synth.h diff --git a/extern/mad-0.15.1b/timer.c b/extern/libmad/timer.c similarity index 100% rename from extern/mad-0.15.1b/timer.c rename to extern/libmad/timer.c diff --git a/extern/mad-0.15.1b/timer.h b/extern/libmad/timer.h similarity index 100% rename from extern/mad-0.15.1b/timer.h rename to extern/libmad/timer.h diff --git a/extern/mad-0.15.1b/version.c b/extern/libmad/version.c similarity index 100% rename from extern/mad-0.15.1b/version.c rename to extern/libmad/version.c diff --git a/extern/mad-0.15.1b/version.h b/extern/libmad/version.h similarity index 100% rename from extern/mad-0.15.1b/version.h rename to extern/libmad/version.h