-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rename MidiTime to TimePos (fix merge conflicts)
- Loading branch information
Showing
308 changed files
with
3,124 additions
and
20,929 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,10 @@ IF(COMMAND CMAKE_POLICY) | |
| CMAKE_POLICY(SET CMP0057 NEW) | ||
| ENDIF(COMMAND CMAKE_POLICY) | ||
|
|
||
|
|
||
| # Import of windows.h breaks min()/max() | ||
| ADD_DEFINITIONS(-DNOMINMAX) | ||
|
|
||
| INCLUDE(PluginList) | ||
| INCLUDE(CheckSubmodules) | ||
| INCLUDE(AddFileDependencies) | ||
|
|
@@ -35,10 +39,10 @@ SET(PROJECT_EMAIL "[email protected]") | |
| SET(PROJECT_DESCRIPTION "${PROJECT_NAME_UCASE} - Free music production software") | ||
| SET(PROJECT_COPYRIGHT "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}") | ||
| SET(VERSION_MAJOR "1") | ||
| SET(VERSION_MINOR "2") | ||
| SET(VERSION_RELEASE "2") | ||
| SET(VERSION_STAGE "") | ||
| SET(VERSION_BUILD "0") | ||
| SET(VERSION_MINOR "3") | ||
| SET(VERSION_RELEASE "0") | ||
| SET(VERSION_STAGE "alpha") | ||
| SET(VERSION_BUILD "") | ||
| SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}") | ||
| IF(VERSION_STAGE) | ||
| SET(VERSION "${VERSION}-${VERSION_STAGE}") | ||
|
|
@@ -97,15 +101,13 @@ ENDIF(LMMS_BUILD_APPLE) | |
|
|
||
| IF(LMMS_BUILD_WIN32) | ||
| SET(WANT_ALSA OFF) | ||
| SET(WANT_JACK OFF) | ||
| SET(WANT_PULSEAUDIO OFF) | ||
| SET(WANT_SNDIO OFF) | ||
| SET(WANT_SOUNDIO OFF) | ||
| SET(WANT_WINMM ON) | ||
| SET(BUNDLE_QT_TRANSLATIONS ON) | ||
| SET(LMMS_HAVE_WINMM TRUE) | ||
| SET(STATUS_ALSA "<not supported on this platform>") | ||
| SET(STATUS_JACK "<not supported on this platform>") | ||
| SET(STATUS_PULSEAUDIO "<not supported on this platform>") | ||
| SET(STATUS_SOUNDIO "<disabled in this release>") | ||
| SET(STATUS_WINMM "OK") | ||
|
|
@@ -201,14 +203,19 @@ IF(WANT_LV2) | |
| IF(PKG_CONFIG_FOUND) | ||
| PKG_CHECK_MODULES(LV2 lv2) | ||
| PKG_CHECK_MODULES(LILV lilv-0) | ||
| IF(LV2_FOUND AND LILV_FOUND) | ||
| SET(LMMS_HAVE_LV2 TRUE) | ||
| SET(STATUS_LV2 "OK") | ||
| ELSE() | ||
| SET(STATUS_LV2 "not found, install it or set PKG_CONFIG_PATH appropriately") | ||
| ENDIF() | ||
| IF(NOT LV2_FOUND AND NOT LILV_FOUND) | ||
| FIND_PACKAGE(LV2 CONFIG) | ||
| FIND_PACKAGE(LILV CONFIG) | ||
| IF(LILV_FOUND) | ||
| SET(LILV_LIBRARIES "lilv::lilv") | ||
| ENDIF() | ||
| ENDIF() | ||
| IF(LV2_FOUND AND LILV_FOUND) | ||
| SET(LMMS_HAVE_LV2 TRUE) | ||
| SET(STATUS_LV2 "OK") | ||
| ELSE() | ||
| SET(STATUS_LV2 "not found, requires pkg-config") | ||
| SET(STATUS_LV2 "not found, install it or set PKG_CONFIG_PATH appropriately") | ||
| ENDIF() | ||
| ELSE(WANT_LV2) | ||
| SET(STATUS_LV2 "not built as requested") | ||
|
|
@@ -433,23 +440,26 @@ ENDIF(NOT LMMS_HAVE_ALSA) | |
|
|
||
| # check for JACK | ||
| IF(WANT_JACK) | ||
| PKG_CHECK_MODULES(JACK jack>=0.77) | ||
| IF(JACK_FOUND) | ||
| IF(WANT_WEAKJACK) | ||
| SET(LMMS_HAVE_WEAKJACK TRUE) | ||
| SET(WEAKJACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/weakjack/weakjack) | ||
| SET(STATUS_JACK "OK (weak linking enabled)") | ||
| # use dlsym instead | ||
| SET(JACK_LIBRARIES ${CMAKE_DL_LIBS}) | ||
| ELSE() | ||
| IF(WANT_WEAKJACK) | ||
| SET(LMMS_HAVE_WEAKJACK TRUE) | ||
| SET(WEAKJACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/weakjack/weakjack) | ||
| SET(JACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/jack2/common) | ||
| SET(STATUS_JACK "OK (weak linking enabled)") | ||
| # use dlsym instead | ||
| SET(JACK_LIBRARIES ${CMAKE_DL_LIBS}) | ||
| SET(LMMS_HAVE_JACK TRUE) | ||
| SET(JACK_FOUND TRUE) | ||
| ELSE() | ||
| PKG_CHECK_MODULES(JACK jack>=0.77) | ||
| IF(JACK_FOUND) | ||
| SET(STATUS_JACK "OK") | ||
| ENDIF() | ||
| SET(LMMS_HAVE_JACK TRUE) | ||
| ELSE(JACK_FOUND) | ||
| ENDIF() | ||
|
|
||
| IF(NOT JACK_FOUND) | ||
| SET(JACK_INCLUDE_DIRS "") | ||
| SET(STATUS_JACK "not found, please install libjack0.100.0-dev (or similar) " | ||
| "if you require JACK support") | ||
| ENDIF(JACK_FOUND) | ||
| SET(STATUS_JACK "not found") | ||
| ENDIF() | ||
| ENDIF(WANT_JACK) | ||
|
|
||
| # check for FFTW3F-library | ||
|
|
@@ -487,9 +497,9 @@ If(WANT_GIG) | |
| ENDIF(WANT_GIG) | ||
|
|
||
| # check for pthreads | ||
| IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD) | ||
| IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD OR LMMS_BUILD_HAIKU) | ||
| FIND_PACKAGE(Threads) | ||
| ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD) | ||
| ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD OR LMMS_BUILD_HAIKU) | ||
|
|
||
| # check for sndio (roaraudio won't work yet) | ||
| IF(WANT_SNDIO) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.