Backmerged build to master.

This commit is contained in:
casey langen 2018-01-13 12:09:01 -08:00
parent 017f0905bf
commit cadb509089
2 changed files with 3 additions and 4 deletions

View File

@ -103,12 +103,11 @@ endif()
add_dependencies(taglibreader taglib) add_dependencies(taglibreader taglib)
if (CMAKE_SYSTEM_NAME MATCHES "Linux") if (CMAKE_SYSTEM_NAME MATCHES "Linux")
# alsa, pulseuadio on by default. sndio off by default.
add_subdirectory(src/plugins/alsaout) add_subdirectory(src/plugins/alsaout)
add_subdirectory(src/plugins/pulseout)
if (${ENABLE_SNDIO} MATCHES "true") if (${ENABLE_SNDIO} MATCHES "true")
add_subdirectory(src/plugins/sndioout) add_subdirectory(src/plugins/sndioout)
endif() endif()
add_subdirectory(src/plugins/pulseout)
elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
add_subdirectory(src/plugins/sndioout) add_subdirectory(src/plugins/sndioout)
if (${ENABLE_PULSEAUDIO} MATCHES "true") if (${ENABLE_PULSEAUDIO} MATCHES "true")

View File

@ -1,6 +1,6 @@
%define name musikcube %define name musikcube
%define build_timestamp %{lua: print(os.date("%Y%m%d"))} %define build_timestamp %{lua: print(os.date("%Y%m%d"))}
%define version 0.35.0 %define version 0.35.1
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
Release: %{dist} Release: %{dist}
@ -21,7 +21,7 @@ A cross-platform, terminal-based audio engine, library, player and server writte
%build %build
cmake -D CMAKE_INSTALL_PREFIX:PATH=%{_prefix} . cmake -D CMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=Release .
make -j2 make -j2
cmake . cmake .