From 489c21960fceb325d43e31d289b6518f48f39d26 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 16 Mar 2016 13:12:27 -0400 Subject: Remove one of the compile-time defines from the LuminaOS.h file, and place it into all the various LuminaOS-.cpp files instead. This allows the Lumina library to function properly when compiling an external application against an installed version of the lib. --- libLumina/LuminaOS-Debian.cpp | 2 ++ libLumina/LuminaOS-DragonFly.cpp | 2 ++ libLumina/LuminaOS-FreeBSD.cpp | 2 ++ libLumina/LuminaOS-Linux.cpp | 2 ++ libLumina/LuminaOS-NetBSD.cpp | 2 ++ libLumina/LuminaOS-OpenBSD.cpp | 2 ++ libLumina/LuminaOS-kFreeBSD.cpp | 2 ++ libLumina/LuminaOS-template.cpp | 2 ++ libLumina/LuminaOS.h | 3 +-- 9 files changed, 17 insertions(+), 2 deletions(-) (limited to 'libLumina') diff --git a/libLumina/LuminaOS-Debian.cpp b/libLumina/LuminaOS-Debian.cpp index 76b6822e..1f84d44b 100644 --- a/libLumina/LuminaOS-Debian.cpp +++ b/libLumina/LuminaOS-Debian.cpp @@ -16,6 +16,8 @@ static int screenbrightness = -1; QString LOS::OSName(){ return "Debian GNU/Linux"; } //OS-specific prefix(s) +// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in +QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications QString LOS::SysPrefix(){ return "/"; } //Prefix for system diff --git a/libLumina/LuminaOS-DragonFly.cpp b/libLumina/LuminaOS-DragonFly.cpp index fb2c2241..b98a36ee 100644 --- a/libLumina/LuminaOS-DragonFly.cpp +++ b/libLumina/LuminaOS-DragonFly.cpp @@ -66,6 +66,8 @@ static bool get_sysctlbyname_uint(const char *name, unsigned int *res) { QString LOS::OSName(){ return "DragonFly BSD"; } //OS-specific prefix(s) +// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in +QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system diff --git a/libLumina/LuminaOS-FreeBSD.cpp b/libLumina/LuminaOS-FreeBSD.cpp index 530ee5f0..72abf0eb 100644 --- a/libLumina/LuminaOS-FreeBSD.cpp +++ b/libLumina/LuminaOS-FreeBSD.cpp @@ -18,6 +18,8 @@ static int audiovolume = -1; QString LOS::OSName(){ return "FreeBSD"; } //OS-specific prefix(s) +// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in +QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system diff --git a/libLumina/LuminaOS-Linux.cpp b/libLumina/LuminaOS-Linux.cpp index 43bcb242..eb9ed48f 100644 --- a/libLumina/LuminaOS-Linux.cpp +++ b/libLumina/LuminaOS-Linux.cpp @@ -16,6 +16,8 @@ static int screenbrightness = -1; QString LOS::OSName(){ return "Linux"; } //OS-specific prefix(s) +// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in +QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system diff --git a/libLumina/LuminaOS-NetBSD.cpp b/libLumina/LuminaOS-NetBSD.cpp index c3b4b3a2..866ccc5c 100644 --- a/libLumina/LuminaOS-NetBSD.cpp +++ b/libLumina/LuminaOS-NetBSD.cpp @@ -12,6 +12,8 @@ QString LOS::OSName(){ return "NetBSD"; } //OS-specific prefix(s) +// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in +QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system diff --git a/libLumina/LuminaOS-OpenBSD.cpp b/libLumina/LuminaOS-OpenBSD.cpp index fa715480..c0fdafd4 100644 --- a/libLumina/LuminaOS-OpenBSD.cpp +++ b/libLumina/LuminaOS-OpenBSD.cpp @@ -15,6 +15,8 @@ static int screenbrightness = -1; QString LOS::OSName(){ return "OpenBSD"; } //OS-specific prefix(s) +// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in +QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system diff --git a/libLumina/LuminaOS-kFreeBSD.cpp b/libLumina/LuminaOS-kFreeBSD.cpp index da0d6fe7..4fe62686 100644 --- a/libLumina/LuminaOS-kFreeBSD.cpp +++ b/libLumina/LuminaOS-kFreeBSD.cpp @@ -20,6 +20,8 @@ static int screenbrightness = -1; QString LOS::OSName(){ return "Debian GNU/kFreeBSD"; } //OS-specific prefix(s) +// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in +QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system diff --git a/libLumina/LuminaOS-template.cpp b/libLumina/LuminaOS-template.cpp index 073b9092..5969bf3a 100644 --- a/libLumina/LuminaOS-template.cpp +++ b/libLumina/LuminaOS-template.cpp @@ -12,6 +12,8 @@ QString LOS::OSName(){ return "Sample"; } //OS-specific prefix(s) +// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in +QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system diff --git a/libLumina/LuminaOS.h b/libLumina/LuminaOS.h index b211d04a..c305277a 100644 --- a/libLumina/LuminaOS.h +++ b/libLumina/LuminaOS.h @@ -20,14 +20,13 @@ #include "LuminaUtils.h" -// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in class LOS{ public: //Return the name of the OS being used static QString OSName(); //OS-specific prefix(s) - static QString LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files + static QString LuminaShare(); //Install dir for Lumina share files static QString AppPrefix(); //Prefix for applications (/usr/local/ on FreeBSD) static QString SysPrefix(); //Prefix for system (/usr/ on FreeBSD) -- cgit