From b8447ebe950d6385958e7381fd2c477e5f93e2d2 Mon Sep 17 00:00:00 2001 From: Maxime Pinard Date: Tue, 2 Apr 2019 19:57:27 -0400 Subject: [PATCH] Moved libmpg123 binaries to 1.25.8 subfolder --- cmake/libmpg123.cmake | 2 +- .../{libmpg123-1.25.8 => libmpg123/1.25.8}/AUTHORS | 0 .../{libmpg123-1.25.8 => libmpg123/1.25.8}/COPYING | 0 .../{libmpg123-1.25.8 => libmpg123/1.25.8}/README | 0 .../1.25.8}/include/fmt123.h | 0 .../1.25.8}/include/mpg123.h | 0 .../1.25.8}/lib/mingw/x64/shared/libmpg123-0.dll | Bin .../1.25.8}/lib/mingw/x64/static/libmpg123.a | Bin .../1.25.8}/lib/mingw/x86/shared/libmpg123-0.dll | Bin .../1.25.8}/lib/mingw/x86/static/libmpg123.a | Bin .../1.25.8}/lib/msvc/x64/shared/libmpg123.dll | Bin .../1.25.8}/lib/msvc/x64/shared/libmpg123.lib | Bin .../1.25.8}/lib/msvc/x64/static/libmpg123.lib | Bin .../1.25.8}/lib/msvc/x86/shared/libmpg123.dll | Bin .../1.25.8}/lib/msvc/x86/shared/libmpg123.lib | Bin .../1.25.8}/lib/msvc/x86/static/libmpg123.lib | Bin 16 files changed, 1 insertion(+), 1 deletion(-) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/AUTHORS (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/COPYING (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/README (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/include/fmt123.h (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/include/mpg123.h (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/lib/mingw/x64/shared/libmpg123-0.dll (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/lib/mingw/x64/static/libmpg123.a (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/lib/mingw/x86/shared/libmpg123-0.dll (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/lib/mingw/x86/static/libmpg123.a (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/lib/msvc/x64/shared/libmpg123.dll (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/lib/msvc/x64/shared/libmpg123.lib (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/lib/msvc/x64/static/libmpg123.lib (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/lib/msvc/x86/shared/libmpg123.dll (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/lib/msvc/x86/shared/libmpg123.lib (100%) rename extlibs/{libmpg123-1.25.8 => libmpg123/1.25.8}/lib/msvc/x86/static/libmpg123.lib (100%) diff --git a/cmake/libmpg123.cmake b/cmake/libmpg123.cmake index e5130e7..4669b47 100644 --- a/cmake/libmpg123.cmake +++ b/cmake/libmpg123.cmake @@ -27,7 +27,7 @@ if(OS_WINDOWS) set(ARCH_FOLDER "x64") endif() - set(EMBEDED_LIBMPG123_PATH ${CMAKE_CURRENT_SOURCE_DIR}/extlibs/${EMBEDDED_LIBMPG123_NAME}-${EMBEDDED_LIBMPG123_VERSION}) + set(EMBEDED_LIBMPG123_PATH ${CMAKE_CURRENT_SOURCE_DIR}/extlibs/${EMBEDDED_LIBMPG123_NAME}/${EMBEDDED_LIBMPG123_VERSION}) set(EMBEDED_LIBMPG123_LINK_PATH ${EMBEDED_LIBMPG123_PATH}/lib/${COMPILER_FOLDER}/${ARCH_FOLDER}) set(EMBEDED_LIBMPG123_COPY_PATH ${EMBEDED_LIBMPG123_PATH}/lib/${COMPILER_FOLDER}/${ARCH_FOLDER}) if(MAGICPLAYER_STATICALLY_LINK_LIBMPG123) diff --git a/extlibs/libmpg123-1.25.8/AUTHORS b/extlibs/libmpg123/1.25.8/AUTHORS similarity index 100% rename from extlibs/libmpg123-1.25.8/AUTHORS rename to extlibs/libmpg123/1.25.8/AUTHORS diff --git a/extlibs/libmpg123-1.25.8/COPYING b/extlibs/libmpg123/1.25.8/COPYING similarity index 100% rename from extlibs/libmpg123-1.25.8/COPYING rename to extlibs/libmpg123/1.25.8/COPYING diff --git a/extlibs/libmpg123-1.25.8/README b/extlibs/libmpg123/1.25.8/README similarity index 100% rename from extlibs/libmpg123-1.25.8/README rename to extlibs/libmpg123/1.25.8/README diff --git a/extlibs/libmpg123-1.25.8/include/fmt123.h b/extlibs/libmpg123/1.25.8/include/fmt123.h similarity index 100% rename from extlibs/libmpg123-1.25.8/include/fmt123.h rename to extlibs/libmpg123/1.25.8/include/fmt123.h diff --git a/extlibs/libmpg123-1.25.8/include/mpg123.h b/extlibs/libmpg123/1.25.8/include/mpg123.h similarity index 100% rename from extlibs/libmpg123-1.25.8/include/mpg123.h rename to extlibs/libmpg123/1.25.8/include/mpg123.h diff --git a/extlibs/libmpg123-1.25.8/lib/mingw/x64/shared/libmpg123-0.dll b/extlibs/libmpg123/1.25.8/lib/mingw/x64/shared/libmpg123-0.dll similarity index 100% rename from extlibs/libmpg123-1.25.8/lib/mingw/x64/shared/libmpg123-0.dll rename to extlibs/libmpg123/1.25.8/lib/mingw/x64/shared/libmpg123-0.dll diff --git a/extlibs/libmpg123-1.25.8/lib/mingw/x64/static/libmpg123.a b/extlibs/libmpg123/1.25.8/lib/mingw/x64/static/libmpg123.a similarity index 100% rename from extlibs/libmpg123-1.25.8/lib/mingw/x64/static/libmpg123.a rename to extlibs/libmpg123/1.25.8/lib/mingw/x64/static/libmpg123.a diff --git a/extlibs/libmpg123-1.25.8/lib/mingw/x86/shared/libmpg123-0.dll b/extlibs/libmpg123/1.25.8/lib/mingw/x86/shared/libmpg123-0.dll similarity index 100% rename from extlibs/libmpg123-1.25.8/lib/mingw/x86/shared/libmpg123-0.dll rename to extlibs/libmpg123/1.25.8/lib/mingw/x86/shared/libmpg123-0.dll diff --git a/extlibs/libmpg123-1.25.8/lib/mingw/x86/static/libmpg123.a b/extlibs/libmpg123/1.25.8/lib/mingw/x86/static/libmpg123.a similarity index 100% rename from extlibs/libmpg123-1.25.8/lib/mingw/x86/static/libmpg123.a rename to extlibs/libmpg123/1.25.8/lib/mingw/x86/static/libmpg123.a diff --git a/extlibs/libmpg123-1.25.8/lib/msvc/x64/shared/libmpg123.dll b/extlibs/libmpg123/1.25.8/lib/msvc/x64/shared/libmpg123.dll similarity index 100% rename from extlibs/libmpg123-1.25.8/lib/msvc/x64/shared/libmpg123.dll rename to extlibs/libmpg123/1.25.8/lib/msvc/x64/shared/libmpg123.dll diff --git a/extlibs/libmpg123-1.25.8/lib/msvc/x64/shared/libmpg123.lib b/extlibs/libmpg123/1.25.8/lib/msvc/x64/shared/libmpg123.lib similarity index 100% rename from extlibs/libmpg123-1.25.8/lib/msvc/x64/shared/libmpg123.lib rename to extlibs/libmpg123/1.25.8/lib/msvc/x64/shared/libmpg123.lib diff --git a/extlibs/libmpg123-1.25.8/lib/msvc/x64/static/libmpg123.lib b/extlibs/libmpg123/1.25.8/lib/msvc/x64/static/libmpg123.lib similarity index 100% rename from extlibs/libmpg123-1.25.8/lib/msvc/x64/static/libmpg123.lib rename to extlibs/libmpg123/1.25.8/lib/msvc/x64/static/libmpg123.lib diff --git a/extlibs/libmpg123-1.25.8/lib/msvc/x86/shared/libmpg123.dll b/extlibs/libmpg123/1.25.8/lib/msvc/x86/shared/libmpg123.dll similarity index 100% rename from extlibs/libmpg123-1.25.8/lib/msvc/x86/shared/libmpg123.dll rename to extlibs/libmpg123/1.25.8/lib/msvc/x86/shared/libmpg123.dll diff --git a/extlibs/libmpg123-1.25.8/lib/msvc/x86/shared/libmpg123.lib b/extlibs/libmpg123/1.25.8/lib/msvc/x86/shared/libmpg123.lib similarity index 100% rename from extlibs/libmpg123-1.25.8/lib/msvc/x86/shared/libmpg123.lib rename to extlibs/libmpg123/1.25.8/lib/msvc/x86/shared/libmpg123.lib diff --git a/extlibs/libmpg123-1.25.8/lib/msvc/x86/static/libmpg123.lib b/extlibs/libmpg123/1.25.8/lib/msvc/x86/static/libmpg123.lib similarity index 100% rename from extlibs/libmpg123-1.25.8/lib/msvc/x86/static/libmpg123.lib rename to extlibs/libmpg123/1.25.8/lib/msvc/x86/static/libmpg123.lib