1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-28 00:00:18 +01:00

Finish the job of 30dbdf4, deleting abandoned source files...

... And correcting #include paths, and removing mentions in read-me files, and
correcting CMakeLists.txt
This commit is contained in:
Paul Licameli
2020-05-25 11:51:28 -04:00
parent e4238a93a0
commit 7fbfc2b292
85 changed files with 21 additions and 12852 deletions

View File

@@ -144,7 +144,6 @@ endfunction()
#
# directory option symbol req chk version
addlib( wxWidgets wxwidgets WX YES NO "" ) # must be first
addlib( FileDialog FileDialog FILEDIALOG YES YES "" )
addlib( expat expat EXPAT YES YES "expat >= 2.1.0" )
addlib( lame lame LAME YES YES "lame >= 3.100" )
addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )

View File

@@ -1,43 +0,0 @@
add_library( ${TARGET} STATIC )
def_vars()
list( APPEND SOURCES
PRIVATE
${TARGET_ROOT}/FileDialog.cpp
$<$<BOOL:${wxIS_WIN}>:${TARGET_ROOT}/win/FileDialogPrivate.cpp>
$<$<BOOL:${wxIS_MAC}>:${TARGET_ROOT}/mac/FileDialogPrivate.mm>
$<$<BOOL:${wxIS_GTK}>:${TARGET_ROOT}/gtk/FileDialogPrivate.cpp>
)
list( APPEND INCLUDES
PUBLIC
${TARGET_ROOT}
)
list( APPEND DEFINES
PRIVATE
$<$<PLATFORM_ID:Windows>:__WIN32__>
)
list( APPEND OPTIONS
PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/permissive->
$<$<CXX_COMPILER_ID:AppleClang,Clang,GNU>:-Wno-deprecated-declarations>
)
list( APPEND LIBRARIES
PRIVATE
wxWidgets
PUBLIC
$<$<BOOL:${wxIS_GTK}>:PkgConfig::GTK>
)
organize_source( "${TARGET_ROOT}" "" "${SOURCES}" )
target_sources( ${TARGET} PRIVATE ${SOURCES} )
target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} )
target_compile_options( ${TARGET} PRIVATE ${OPTIONS} )
target_include_directories( ${TARGET} PRIVATE ${INCLUDES} )
target_link_libraries( ${TARGET} PRIVATE ${LIBRARIES} )

View File

@@ -7,6 +7,3 @@ the CMakeList.txt files. We did try bundling several libraries under one
CMakeList.txt without using subdirectories. However, we were then fighting
CMake too much - and did not have a clean separation of information between sub
projects.
We don't need the proxies for our own 'lib_src' such as mod-script-pipe and
FileDialog, where we 'own' the CMakeList.txt file.

View File

@@ -1,59 +0,0 @@
set( TARGET mod-null )
set( TARGET_ROOT "${libsrc}/${TARGET}" )
message( STATUS "========== Configuring ${TARGET} ==========" )
def_vars()
add_library( ${TARGET} MODULE EXCLUDE_FROM_ALL )
list( APPEND SOURCES
PRIVATE
${TARGET_ROOT}/ModNullCallback.cpp
${TARGET_ROOT}/ModNullCallback.h
)
get_target_property( INCLUDES wxWidgets INTERFACE_INCLUDE_DIRECTORIES )
list( APPEND INCLUDES
PUBLIC
${TARGET_ROOT}
)
get_target_property( DEFINES wxWidgets INTERFACE_COMPILE_DEFINITIONS )
list( APPEND DEFINES
PRIVATE
# This is needed until the transition to cmake is complete and
# the Windows pragmas are removed from ModNullCallback.cpp.
# Without it, the wxWidgets "debug.h" will define __WXDEBUG__
# which then causes this module to emit library pragmas for the
# debug versions of wxWidgets...even if the build is for Release.
wxDEBUG_LEVEL=0
)
list( APPEND LOPTS
PRIVATE
$<$<PLATFORM_ID:Darwin>:-undefined dynamic_lookup>
)
list( APPEND LIBRARIES
PRIVATE
Audacity
$<$<PLATFORM_ID:Windows>:wxWidgets>
$<$<PLATFORM_ID:Windows>:FileDialog>
)
set_target_property_all( ${TARGET} LIBRARY_OUTPUT_DIRECTORY "${_DEST}/modules" )
set_target_properties( ${TARGET}
PROPERTIES
PREFIX ""
FOLDER "lib-src"
)
organize_source( "${TARGET_ROOT}" "" "${SOURCES}" )
target_sources( ${TARGET} PRIVATE ${SOURCES} )
target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} )
target_include_directories( ${TARGET} PRIVATE ${INCLUDES} )
target_link_options( ${TARGET} PRIVATE ${LOPTS} )
target_link_libraries( ${TARGET} PRIVATE ${LIBRARIES} )

View File

@@ -1,64 +0,0 @@
set( TARGET mod-nyq-bench )
set( TARGET_ROOT "${libsrc}/${TARGET}" )
message( STATUS "========== Configuring ${TARGET} ==========" )
def_vars()
add_library( ${TARGET} MODULE EXCLUDE_FROM_ALL )
list( APPEND SOURCES
PRIVATE
${TARGET_ROOT}/NyqBench.cpp
${TARGET_ROOT}/NyqBench.h
)
get_target_property( wx_INCLUDES wxWidgets INTERFACE_INCLUDE_DIRECTORIES )
get_target_property( pa_INCLUDES portaudio-v19 INTERFACE_INCLUDE_DIRECTORIES )
get_target_property( ny_INCLUDES libnyquist INTERFACE_INCLUDE_DIRECTORIES )
list( APPEND INCLUDES
PUBLIC
${wx_INCLUDES}
${pa_INCLUDES}
${ny_INCLUDES}
${TARGET_ROOT}
)
get_target_property( DEFINES wxWidgets INTERFACE_COMPILE_DEFINITIONS )
list( APPEND DEFINES
PRIVATE
# This is needed until the transition to cmake is complete and
# the Windows pragmas are removed from NyqBench.cpp. Without
# it, the wxWidgets "debug.h" will define __WXDEBUG__ which
# then causes this module to emit library pragmas for the debug
# versions of wxWidgets...even if the build is for Release.
wxDEBUG_LEVEL=0
)
list( APPEND LOPTS
PRIVATE
$<$<PLATFORM_ID:Darwin>:-undefined dynamic_lookup>
)
list( APPEND LIBRARIES
PRIVATE
Audacity
$<$<PLATFORM_ID:Windows>:wxWidgets>
$<$<PLATFORM_ID:Windows>:FileDialog>
)
set_target_property_all( ${TARGET} LIBRARY_OUTPUT_DIRECTORY "${_DEST}/modules" )
set_target_properties( ${TARGET}
PROPERTIES
PREFIX ""
FOLDER "lib-src"
)
organize_source( "${TARGET_ROOT}" "" "${SOURCES}" )
target_sources( ${TARGET} PRIVATE ${SOURCES} )
target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} )
target_include_directories( ${TARGET} PRIVATE ${INCLUDES} )
target_link_options( ${TARGET} PRIVATE ${LOPTS} )
target_link_libraries( ${TARGET} PRIVATE ${LIBRARIES} )

View File

@@ -1,60 +0,0 @@
set( TARGET mod-script-pipe )
set( TARGET_ROOT "${libsrc}/${TARGET}" )
message( STATUS "========== Configuring ${TARGET} ==========" )
def_vars()
add_library( ${TARGET} MODULE )
list( APPEND SOURCES
PRIVATE
${TARGET_ROOT}/PipeServer.cpp
${TARGET_ROOT}/ScripterCallback.cpp
)
get_target_property( INCLUDES wxWidgets INTERFACE_INCLUDE_DIRECTORIES )
list( APPEND INCLUDES
PUBLIC
${TARGET_ROOT}
)
get_target_property( DEFINES wxWidgets INTERFACE_COMPILE_DEFINITIONS )
list( APPEND DEFINES
PRIVATE
BUILDING_SCRIPT_PIPE
# This is needed until the transition to cmake is complete and
# the Windows pragmas are removed from ScripterCallback.cpp.
# Without it, the wxWidgets "debug.h" will define __WXDEBUG__
# which then causes this module to emit library pragmas for the
# debug versions of wxWidgets...even if the build is for Release.
wxDEBUG_LEVEL=0
)
list( APPEND LOPTS
PRIVATE
$<$<PLATFORM_ID:Darwin>:-undefined dynamic_lookup>
)
list( APPEND LIBRARIES
PRIVATE
Audacity
$<$<PLATFORM_ID:Windows>:wxWidgets>
)
set_target_property_all( ${TARGET} LIBRARY_OUTPUT_DIRECTORY "${_DEST}/modules" )
set_target_properties( ${TARGET}
PROPERTIES
PREFIX ""
FOLDER "lib-src"
)
organize_source( "${TARGET_ROOT}" "" "${SOURCES}" )
target_sources( ${TARGET} PRIVATE ${SOURCES} )
target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} )
target_include_directories( ${TARGET} PRIVATE ${INCLUDES} )
target_link_options( ${TARGET} PRIVATE ${LOPTS} )
target_link_libraries( ${TARGET} PRIVATE ${LIBRARIES} )