removed alsa defines
This commit is contained in:
Igor Korsukov
parent
5af55a5808
commit
593bcc6236
6 changed files with 11 additions and 54 deletions
|
|
@ -152,20 +152,6 @@ if (MSCORE_UNSTABLE)
|
|||
SET (MUSESCORE_NAME_VERSION "${MUSESCORE_NAME_VERSION} (${MUSESCORE_VERSION_FULL} unstable)")
|
||||
endif (MSCORE_UNSTABLE)
|
||||
|
||||
# Disable components not supported on Windows
|
||||
if (MSVC OR MINGW)
|
||||
set(WIN_NOT_AVAIL "Not available on Windows")
|
||||
option(BUILD_PULSEAUDIO ${WIN_NOT_AVAIL} OFF)
|
||||
option(BUILD_ALSA ${WIN_NOT_AVAIL} OFF)
|
||||
endif (MSVC OR MINGW)
|
||||
|
||||
# Disable components not supported on Mac
|
||||
if (APPLE)
|
||||
set(MAC_NOT_AVAIL "Not available on Mac")
|
||||
option(BUILD_PULSEAUDIO ${MAC_NOT_AVAIL} OFF)
|
||||
option(BUILD_ALSA ${MAC_NOT_AVAIL} OFF)
|
||||
endif (APPLE)
|
||||
|
||||
# Disable components not supported on Linux/BSD
|
||||
if (NOT APPLE AND NOT MINGW AND NOT MSVC)
|
||||
set(NIX_NOT_AVAIL "Not available on Linux/BSD")
|
||||
|
|
@ -185,7 +171,6 @@ SET(JACK_LONGNAME "JACK (Jack Audio Connection Kit)")
|
|||
SET(JACK_MIN_VERSION "0.98.0")
|
||||
option(BUILD_JACK "Build with support for ${JACK_LONGNAME} audio backend. JACK >= ${JACK_MIN_VERSION} will be needed." ON)
|
||||
option(BUILD_PULSEAUDIO "Build with support for PulseAudio audio backend." ON)
|
||||
option(BUILD_ALSA "Build with support for ALSA audio backend." ON)
|
||||
option(BUILD_PCH "Build using precompiled headers." ON)
|
||||
option(BUILD_FOR_WINSTORE "Build for the Windows Store." OFF)
|
||||
option(COVERAGE "Build with instrumentation to record code coverage." OFF)
|
||||
|
|
@ -442,34 +427,6 @@ if (USE_SYSTEM_FREETYPE)
|
|||
endif (APPLE)
|
||||
endif (USE_SYSTEM_FREETYPE)
|
||||
|
||||
##
|
||||
## ALSA >= 1.0.0
|
||||
##
|
||||
|
||||
if (BUILD_ALSA)
|
||||
PKGCONFIG1 (alsa 1.0.0 ALSA_INCDIR ALSA_LIBDIR ALSA_LIB ALSA_CPP )
|
||||
if (NOT ALSA_INCDIR)
|
||||
message(SEND_ERROR "Error: ALSA support requested (BUILD_ALSA=${BUILD_ALSA}), but ALSA >= 1.0.0 was not found.")
|
||||
else (NOT ALSA_INCDIR)
|
||||
message("ALSA >= 1.0.0 found. ALSA support enabled. INCDIR ${ALSA_INCDIR}, LIBDIR ${ALSA_LIBDIR}, LIB ${ALSA_LIB}, CPP ${ALSA_CPP}")
|
||||
set (USE_ALSA 1)
|
||||
endif (NOT ALSA_INCDIR)
|
||||
else (BUILD_ALSA)
|
||||
message(STATUS "ALSA support disabled")
|
||||
endif (BUILD_ALSA)
|
||||
|
||||
##
|
||||
## MIDI
|
||||
##
|
||||
|
||||
if (APPLE OR MINGW OR MSVC)
|
||||
set (HAS_MIDI 1)
|
||||
else (APPLE OR MINGW OR MSVC)
|
||||
if (USE_ALSA)
|
||||
set (HAS_MIDI 1)
|
||||
endif (USE_ALSA)
|
||||
endif (APPLE OR MINGW OR MSVC)
|
||||
|
||||
##
|
||||
## PulseAudio
|
||||
##
|
||||
|
|
|
|||
3
Makefile
3
Makefile
|
|
@ -35,7 +35,6 @@ LABEL=""# E.g.: LABEL="Development Build" --> "MuseScore 2" becomes "MuseScore 2
|
|||
BUILD_LAME="ON" # Non-free, required for MP3 support. Override with "OFF" to disable.
|
||||
BUILD_PULSEAUDIO="ON" # Override with "OFF" to disable.
|
||||
BUILD_JACK="ON" # Override with "OFF" to disable.
|
||||
BUILD_ALSA="ON" # Override with "OFF" to disable.
|
||||
BUILD_WEBENGINE="ON" # Override with "OFF" to disable.
|
||||
USE_SYSTEM_FREETYPE="OFF" # Override with "ON" to enable. Requires freetype >= 2.5.2.
|
||||
COVERAGE="OFF" # Override with "ON" to enable.
|
||||
|
|
@ -73,7 +72,6 @@ release:
|
|||
-DBUILD_LAME="${BUILD_LAME}" \
|
||||
-DBUILD_PULSEAUDIO="${BUILD_PULSEAUDIO}" \
|
||||
-DBUILD_JACK="${BUILD_JACK}" \
|
||||
-DBUILD_ALSA="${BUILD_ALSA}" \
|
||||
-DBUILD_WEBENGINE="${BUILD_WEBENGINE}" \
|
||||
-DUSE_SYSTEM_FREETYPE="${USE_SYSTEM_FREETYPE}" \
|
||||
-DDOWNLOAD_SOUNDFONT="${DOWNLOAD_SOUNDFONT}" \
|
||||
|
|
@ -107,7 +105,6 @@ debug:
|
|||
-DBUILD_LAME="${BUILD_LAME}" \
|
||||
-DBUILD_PULSEAUDIO="${BUILD_PULSEAUDIO}" \
|
||||
-DBUILD_JACK="${BUILD_JACK}" \
|
||||
-DBUILD_ALSA="${BUILD_ALSA}" \
|
||||
-DBUILD_WEBENGINE="${BUILD_WEBENGINE}" \
|
||||
-DUSE_SYSTEM_FREETYPE="${USE_SYSTEM_FREETYPE}" \
|
||||
-DCOVERAGE="${COVERAGE}" \
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
#ifndef MUSESCORE_CONFIG_H
|
||||
#define MUSESCORE_CONFIG_H
|
||||
|
||||
#cmakedefine USE_ALSA
|
||||
#cmakedefine USE_JACK
|
||||
#cmakedefine USE_PORTAUDIO
|
||||
#cmakedefine USE_PULSEAUDIO
|
||||
|
|
|
|||
|
|
@ -100,6 +100,17 @@ if(PLATFORM_IS_WINDOWS)
|
|||
endif()
|
||||
|
||||
if(PLATFORM_IS_LINUX)
|
||||
|
||||
##
|
||||
## ALSA >= 1.0.0
|
||||
##
|
||||
PKGCONFIG1 (alsa 1.0.0 ALSA_INCDIR ALSA_LIBDIR ALSA_LIB ALSA_CPP )
|
||||
if (NOT ALSA_INCDIR)
|
||||
message(SEND_ERROR "Error: ALSA support requested (BUILD_ALSA=${BUILD_ALSA}), but ALSA >= 1.0.0 was not found.")
|
||||
else (NOT ALSA_INCDIR)
|
||||
message("ALSA >= 1.0.0 found. ALSA support enabled. INCDIR ${ALSA_INCDIR}, LIBDIR ${ALSA_LIBDIR}, LIB ${ALSA_LIB}, CPP ${ALSA_CPP}")
|
||||
endif (NOT ALSA_INCDIR)
|
||||
|
||||
set(MODULE_LINK pthread ${ALSA_LIB} )
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -69,11 +69,6 @@
|
|||
#define PREF_IMPORT_STYLE_STYLEFILE "import/style/styleFile"
|
||||
#define PREF_IMPORT_COMPATIBILITY_RESET_ELEMENT_POSITIONS "import/compatibility/resetElementPositions"
|
||||
#define PREF_APP_PALETTESCALE "application/paletteScale"
|
||||
#define PREF_IO_ALSA_DEVICE "io/alsa/device"
|
||||
#define PREF_IO_ALSA_FRAGMENTS "io/alsa/fragments"
|
||||
#define PREF_IO_ALSA_PERIODSIZE "io/alsa/periodSize"
|
||||
#define PREF_IO_ALSA_SAMPLERATE "io/alsa/sampleRate"
|
||||
#define PREF_IO_ALSA_USEALSAAUDIO "io/alsa/useAlsaAudio"
|
||||
#define PREF_IO_JACK_REMEMBERLASTCONNECTIONS "io/jack/rememberLastConnections"
|
||||
#define PREF_IO_JACK_TIMEBASEMASTER "io/jack/timebaseMaster"
|
||||
#define PREF_IO_JACK_USEJACKAUDIO "io/jack/useJackAudio"
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@
|
|||
#ifndef MUSESCORE_CONFIG_H
|
||||
#define MUSESCORE_CONFIG_H
|
||||
|
||||
#define USE_ALSA
|
||||
#define USE_JACK
|
||||
/* #undef USE_PORTAUDIO */
|
||||
|
||||
#define MSCORE_UNSTABLE
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue