diff options
author | Ken Moore <moorekou@gmail.com> | 2016-01-11 15:51:52 -0500 |
---|---|---|
committer | Ken Moore <moorekou@gmail.com> | 2016-01-11 15:51:52 -0500 |
commit | 4a94520f2e6eb55f9d651321b15ed638404a66bb (patch) | |
tree | 8d4b3f7d8ec2cf262e4cfc595ab86768b3820f81 /libLumina/LuminaOS.h | |
parent | Start the work of abstracting out the OS-detection/build system from the indi... (diff) | |
download | lumina-4a94520f2e6eb55f9d651321b15ed638404a66bb.tar.gz lumina-4a94520f2e6eb55f9d651321b15ed638404a66bb.tar.bz2 lumina-4a94520f2e6eb55f9d651321b15ed638404a66bb.zip |
Large cleanup of the Lumina project files and OS-detection/support systems.
1) Setup all the subprojects to use the new OS-detect.pri subfile
2) Automatically detect/set the build datetime string for the project when qmake is run.
3) Automatically read/embed the current GIT revision into the Lumina version string
4) Remove the old QtConfig shortcut function from the LuminaOS class (and all templates).
Diffstat (limited to 'libLumina/LuminaOS.h')
-rw-r--r-- | libLumina/LuminaOS.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libLumina/LuminaOS.h b/libLumina/LuminaOS.h index 5672454b..b211d04a 100644 --- a/libLumina/LuminaOS.h +++ b/libLumina/LuminaOS.h @@ -20,29 +20,20 @@ #include "LuminaUtils.h" -//First try to load the globals.h to set PREFIX -#ifndef PREFIX -#include "global.h" -#endif -//Now use the default value for PREFIX if not set -#ifndef PREFIX -#define PREFIX QString("/usr/local") -#endif - +// 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 (PREFIX+"/share/Lumina-DE/"); } //Install dir for Lumina share files + static QString LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //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) //OS-specific application shortcuts (*.desktop files) static QString ControlPanelShortcut(); static QString AppStoreShortcut(); - static QString QtConfigShortcut(); //Scan for mounted external devices static QStringList ExternalDevicePaths(); //Returns: QStringList[<type>::::<filesystem>::::<path>] |