Commit 5546541f authored by Josué Ortega's avatar Josué Ortega

New upstream version 1.6~git20180112.ea4ab3b

parent 224357f1
...@@ -17,15 +17,18 @@ file(GLOB_RECURSE pamix_SRC ...@@ -17,15 +17,18 @@ file(GLOB_RECURSE pamix_SRC
include_directories("include") include_directories("include")
link_libraries("pulse" "pthread") link_libraries("pulse" "pthread")
find_package(PkgConfig REQUIRED QUIET)
IF (WITH_UNICODE) IF (WITH_UNICODE)
link_libraries("ncursesw") pkg_search_module(NCURSESW REQUIRED ncursesw)
link_libraries(${NCURSESW_LDFLAGS})
add_definitions(-DFEAT_UNICODE) add_definitions(-DFEAT_UNICODE)
ELSE () ELSE ()
link_libraries("ncurses") pkg_search_module(NCURSES REQUIRED ncurses)
link_libraries(${NCURSES_LDFLAGS})
ENDIF () ENDIF ()
add_executable(pamix ${pamix_SRC}) add_executable(pamix ${pamix_SRC})
install(FILES pamix.conf DESTINATION /etc) install(FILES pamix.conf DESTINATION /etc/xdg)
install(TARGETS pamix DESTINATION bin) install(TARGETS pamix DESTINATION bin)
install(FILES man/pamix.1 DESTINATION share/man/man1) install(FILES man/pamix.1 DESTINATION share/man/man1)
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
1. [**Installation**](#installation) 1. [**Installation**](#installation)
1. Gentoo 1. Gentoo
2. Arch 2. Arch
3. openSUSE
2. [**Building Manually**](#building-manually) 2. [**Building Manually**](#building-manually)
1. Dependencies 1. Dependencies
2. Building and Installing 2. Building and Installing
...@@ -20,6 +21,9 @@ ...@@ -20,6 +21,9 @@
### Arch ### ### Arch ###
`yaourt -S pamix-git` `yaourt -S pamix-git`
### openSUSE ###
`zypper in pamix`
# Building Manually: # # Building Manually: #
## Dependencies: # ## Dependencies: #
...@@ -27,6 +31,7 @@ In order for CMake to properly inject the current version into the headers and m ...@@ -27,6 +31,7 @@ In order for CMake to properly inject the current version into the headers and m
### Build ## ### Build ##
* cmake * cmake
* pkg-config
### Runtime ## ### Runtime ##
* PulseAudio * PulseAudio
......
...@@ -130,7 +130,7 @@ void loadConfiguration() { ...@@ -130,7 +130,7 @@ void loadConfiguration() {
char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS"); char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
path = xdg_config_dirs ? xdg_config_dirs : "/etc"; path = xdg_config_dirs ? xdg_config_dirs : "/etc/xdg";
path += "/pamix.conf"; path += "/pamix.conf";
size_t cpos = path.find(':'); size_t cpos = path.find(':');
while (cpos != std::string::npos) { while (cpos != std::string::npos) {
......
#include <pamix_ui.hpp> #include <pamix_ui.hpp>
#ifdef FEAT_UNICODE
#include <ncursesw/ncurses.h>
#else
#include <ncurses.h>
#endif
#include <pamix.hpp> #include <pamix.hpp>
void pamix_ui::reset() { void pamix_ui::reset() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment