diff options
| author | Ken Moore <moorekou@gmail.com> | 2016-02-02 08:41:10 -0500 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2016-02-02 08:41:10 -0500 |
| commit | 1914eb08cf2cc9f9ed135ada27cf9c6751fa7354 (patch) | |
| tree | 1d960752a5061055da2510b72c2c498e7b55b924 /OS-detect.pri | |
| parent | Merge branch 'master' of github.com:pcbsd/lumina (diff) | |
| download | lumina-1914eb08cf2cc9f9ed135ada27cf9c6751fa7354.tar.gz lumina-1914eb08cf2cc9f9ed135ada27cf9c6751fa7354.tar.bz2 lumina-1914eb08cf2cc9f9ed135ada27cf9c6751fa7354.zip | |
Add a few more built-in Qt paths to the OS-detect file, and commit a bit more work on the lumina-terminal app.
Diffstat (limited to 'OS-detect.pri')
| -rw-r--r-- | OS-detect.pri | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OS-detect.pri b/OS-detect.pri index 1422130c..4b126148 100644 --- a/OS-detect.pri +++ b/OS-detect.pri @@ -19,9 +19,10 @@ !defined(OS){ message("Build OS Info: $${QMAKE_HOST.os}, $${QMAKE_HOST.arch}, $${QMAKE_HOST.version_string}") - #Load the initial library search locations (more can be added in the OS-specific sections below) - LIBS = -L$${PWD}/libLumina -L$$[QT_INSTALL_LIBS] - + #Load the initial library/includefile search locations (more can be added in the OS-specific sections below) + LIBS = -L$${PRO_FILE_PWD}/libLumina -L$$[QT_INSTALL_LIBS] + INCLUDEPATH = $${PRO_FILE_PWD}/libLumina $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_PREFIX] + #Setup the default values for build settings (if not explicitly set previously) !defined(PREFIX){ PREFIX=/usr/local } !defined(LIBPREFIX){ LIBPREFIX=$${PREFIX}/lib } @@ -79,7 +80,7 @@ # Setup the dirs needed to find/load libraries QMAKE_LIBDIR = $$[QT_INSTALL_LIBS] $$LIBPREFIX/qt5 $$LIBPREFIX - INCLUDEPATH = $${PWD}/libLumina $$PREFIX/include + INCLUDEPATH +=$${PREFIX}/include # If the detailed install variables are not set - create them from the general vars !defined(L_BINDIR){ L_BINDIR = $${PREFIX}/bin } |