Skip to content
Snippets Groups Projects
Commit d4b2ac46 authored by Vitaly Sverchinsky's avatar Vitaly Sverchinsky
Browse files

Drop outdated MAD imported

parent cf1d06c2
No related branches found
No related tags found
No related merge requests found
...@@ -11,15 +11,6 @@ audacity_find_package(libmp3lame REQUIRED) ...@@ -11,15 +11,6 @@ audacity_find_package(libmp3lame REQUIRED)
audacity_find_package(mpg123 OPTION_NAME libmpg123) audacity_find_package(mpg123 OPTION_NAME libmpg123)
if( NOT ${_OPT}use_libmpg123 STREQUAL "off" )
# If we are building against libmpg123, we need to drop
# the previos configuration, which may used libmad
set( USE_LIBMAD OFF CACHE INTERNAL "" FORCE )
set( ${_OPT}use_libmad "off" )
else()
audacity_find_package(libmad)
endif()
audacity_find_package(libid3tag) audacity_find_package(libid3tag)
audacity_find_package(WavPack) audacity_find_package(WavPack)
......
...@@ -591,10 +591,6 @@ list( APPEND SOURCES ...@@ -591,10 +591,6 @@ list( APPEND SOURCES
import/ImportMIDI.h import/ImportMIDI.h
> >
$<$<BOOL:${USE_LIBMAD}>:
import/ImportMP3_MAD.cpp
>
# Menus # Menus
menus/ClipMenus.cpp menus/ClipMenus.cpp
...@@ -1054,7 +1050,6 @@ set( LIBRARIES ...@@ -1054,7 +1050,6 @@ set( LIBRARIES
PUBLIC PUBLIC
${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_REQUIRED_LIBRARIES}
ZLIB::ZLIB ZLIB::ZLIB
$<$<BOOL:${USE_LIBMAD}>:libmad::libmad>
$<$<BOOL:${USE_LIBOPUS}>:Opus::opus> $<$<BOOL:${USE_LIBOPUS}>:Opus::opus>
$<$<BOOL:${USE_MIDI}>:portmidi::portmidi> $<$<BOOL:${USE_MIDI}>:portmidi::portmidi>
$<$<BOOL:${USE_MIDI}>:portsmf> $<$<BOOL:${USE_MIDI}>:portsmf>
...@@ -1278,7 +1273,7 @@ else() ...@@ -1278,7 +1273,7 @@ else()
audio/x-flac audio/x-flac
) )
endif() endif()
if( USE_LIBMAD OR USE_LIBMPG123) if( USE_LIBMPG123)
list( APPEND MIMETYPES list( APPEND MIMETYPES
audio/mpeg audio/mpeg
) )
......
...@@ -60,9 +60,6 @@ ...@@ -60,9 +60,6 @@
/* Define if libid3tag is present */ /* Define if libid3tag is present */
#cmakedefine USE_LIBID3TAG 1 #cmakedefine USE_LIBID3TAG 1
/* Define if mp3 support is implemented with the libmad library */
#cmakedefine USE_LIBMAD 1
/* Define if mp3 support is implemented with the libmpg123 library */ /* Define if mp3 support is implemented with the libmpg123 library */
#cmakedefine USE_LIBMPG123 1 #cmakedefine USE_LIBMPG123 1
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment