diff --git a/include/settings.hpp.cmake b/include/settings.hpp.cmake index 20eb0f95..ed3c0d55 100644 --- a/include/settings.hpp.cmake +++ b/include/settings.hpp.cmake @@ -11,7 +11,6 @@ extern const char* const APP_VERSION; #cmakedefine01 ENABLE_MPD #cmakedefine01 ENABLE_NETWORK #cmakedefine01 WITH_LIBNL -#define WIRELESS_LIB "@WIRELESS_LIB@" #cmakedefine01 ENABLE_I3 #cmakedefine01 ENABLE_CURL #cmakedefine01 ENABLE_PULSEAUDIO @@ -54,10 +53,10 @@ static const int SIGN_PRIORITY_BAR{3}; static const int SIGN_PRIORITY_RENDERER{4}; static const int SIGN_PRIORITY_TRAY{5}; -static const int SINK_PRIORITY_BAR{1}; -static const int SINK_PRIORITY_SCREEN{2}; -static const int SINK_PRIORITY_TRAY{3}; -static const int SINK_PRIORITY_MODULE{4}; +extern const int SINK_PRIORITY_BAR; +extern const int SINK_PRIORITY_SCREEN; +extern const int SINK_PRIORITY_TRAY; +extern const int SINK_PRIORITY_MODULE; extern const char* const ALSA_SOUNDCARD; extern const char* const BSPWM_SOCKET_PATH; @@ -70,9 +69,10 @@ extern const char* const PATH_CPU_INFO; extern const char* const PATH_MEMORY_INFO; extern const char* const PATH_MESSAGING_FIFO; extern const char* const PATH_TEMPERATURE_INFO; +extern const char* const WIRELESS_LIB; -extern bool version_details(const std::vector& args); +bool version_details(const std::vector& args); -extern void print_build_info(bool extended = false); +void print_build_info(bool extended = false); // vim:ft=cpp diff --git a/src/settings.cpp.cmake b/src/settings.cpp.cmake index 2b1abb5a..eadf3bb0 100644 --- a/src/settings.cpp.cmake +++ b/src/settings.cpp.cmake @@ -3,6 +3,11 @@ const char* const APP_NAME{"@PROJECT_NAME@"}; const char* const APP_VERSION{"@APP_VERSION@"}; +const int SINK_PRIORITY_BAR{1}; +const int SINK_PRIORITY_SCREEN{2}; +const int SINK_PRIORITY_TRAY{3}; +const int SINK_PRIORITY_MODULE{4}; + const char* const ALSA_SOUNDCARD{"@SETTING_ALSA_SOUNDCARD@"}; const char* const BSPWM_SOCKET_PATH{"@SETTING_BSPWM_SOCKET_PATH@"}; const char* const BSPWM_STATUS_PREFIX{"@SETTING_BSPWM_STATUS_PREFIX@"}; @@ -14,6 +19,7 @@ const char* const PATH_CPU_INFO{"@SETTING_PATH_CPU_INFO@"}; const char* const PATH_MEMORY_INFO{"@SETTING_PATH_MEMORY_INFO@"}; const char* const PATH_MESSAGING_FIFO{"@SETTING_PATH_MESSAGING_FIFO@"}; const char* const PATH_TEMPERATURE_INFO{"@SETTING_PATH_TEMPERATURE_INFO@"}; +const char* const WIRELESS_LIB{"@WIRELESS_LIB@"}; bool version_details(const std::vector& args) { for (auto&& arg : args) {