LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4156 from lasconic/export-build-webengine

Browse source 
expose BUILD_WEBENGINE to Makefile
This commit is contained in:
Nicolas Froment 2018-11-17 09:30:45 +01:00 committed by GitHub
commit b30c36078d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -124,7 +124,7 @@ option(BUILD_PULSEAUDIO "Build with support for PulseAudio audio backend." ON)
option(BUILD_ALSA "Build with support for ALSA audio backend." ON)
option(BUILD_PORTAUDIO "Build with support for PortAudio audio backend." ON)
option(BUILD_PORTMIDI "Build with support for PortAudio's MIDI features." ${BUILD_PORTAUDIO}) # PortAudio required
option(BUILD_WEBEBENGINE "Built in webengine support" ON)
option(BUILD_WEBENGINE "Built in webengine support" 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)
@ -236,15 +236,15 @@ SET(MUSESCORE_NAME_VERSION "${MUSESCORE_NAME} ${MUSESCORE_VERSION_MAJOR}")
#
SET(MUSESCORE_VERSION_FULL "${MUSESCORE_VERSION}.${MUSESCORE_VERSION_PATCH}")
if (BUILD_WEBEBENGINE)
if (BUILD_WEBENGINE)
if (MINGW)
SET (USE_WEBENGINE 0)
else (MINGW)
SET (USE_WEBENGINE 1)
endif(MINGW)
else (BUILD_WEBEBENGINE)
else (BUILD_WEBENGINE)
SET (USE_WEBENGINE 0)
endif (BUILD_WEBEBENGINE)
endif (BUILD_WEBENGINE)
if (MUSESCORE_LABEL)
SET (MUSESCORE_NAME_VERSION "${MUSESCORE_NAME_VERSION} ${MUSESCORE_LABEL}")

3
Makefile
View file

@ -33,6 +33,7 @@ BUILD_LAME="ON" # Non-free, required for MP3 support. Override with "OFF" to dis
BUILD_PULSEAUDIO="ON" # Override with "OFF" to disable.
BUILD_JACK="ON" # Override with "OFF" to disable.
BUILD_PORTAUDIO="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.
DOWNLOAD_SOUNDFONT="ON" # Override with "OFF" to disable latest soundfont download.
@ -59,6 +60,7 @@ release:
-DBUILD_PULSEAUDIO="${BUILD_PULSEAUDIO}" \
-DBUILD_JACK="${BUILD_JACK}" \
-DBUILD_PORTAUDIO="${BUILD_PORTAUDIO}" \
-DBUILD_WEBENGINE="${BUILD_WEBENGINE}" \
-DUSE_SYSTEM_FREETYPE="${USE_SYSTEM_FREETYPE}" \
-DDOWNLOAD_SOUNDFONT="${DOWNLOAD_SOUNDFONT}" \
-DCMAKE_SKIP_RPATH="${NO_RPATH}" ..; \
@ -86,6 +88,7 @@ debug:
-DBUILD_PULSEAUDIO="${BUILD_PULSEAUDIO}" \
-DBUILD_JACK="${BUILD_JACK}" \
-DBUILD_PORTAUDIO="${BUILD_PORTAUDIO}" \
-DBUILD_WEBENGINE="${BUILD_WEBENGINE}" \
-DUSE_SYSTEM_FREETYPE="${USE_SYSTEM_FREETYPE}" \
-DCOVERAGE="${COVERAGE}" \
-DDOWNLOAD_SOUNDFONT="${DOWNLOAD_SOUNDFONT}" \