diff options
| author | Ken Moore <moorekou@gmail.com> | 2016-04-25 13:21:23 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2016-04-25 13:21:23 -0400 |
| commit | 0ebbba46633237ce55d63dfdb2959da30a40a693 (patch) | |
| tree | 8fab3519ac93d1b0771718822b43f0a80dd13a48 | |
| parent | Rearrange the Lumina source tree quite a bit: (diff) | |
| download | lumina-0ebbba46633237ce55d63dfdb2959da30a40a693.tar.gz lumina-0ebbba46633237ce55d63dfdb2959da30a40a693.tar.bz2 lumina-0ebbba46633237ce55d63dfdb2959da30a40a693.zip | |
Fix a couple other files which needed to account for the path changes.
| -rw-r--r-- | i18n-projects | 24 | ||||
| -rw-r--r-- | src-qt5/OS-detect.pri | 6 |
2 files changed, 18 insertions, 12 deletions
diff --git a/i18n-projects b/i18n-projects index 7a61b83e..62289baa 100644 --- a/i18n-projects +++ b/i18n-projects @@ -4,13 +4,19 @@ # XXXXXX_LANG.ts <Qt project dir> # ^^^^^^ File prefix for .ts file -lumina-config lumina-config -lumina-desktop lumina-desktop -lumina-fm lumina-fm -lumina-open lumina-open -lumina-screenshot lumina-screenshot -lumina-search lumina-search -lumina-info lumina-info -lumina-fileinfo lumina-fileinfo -lumina-xconfig lumina-xconfig +#Core +lumina-desktop src-qt5/core/lumina-desktop +lumina-info src-qt5/core/lumina-info +lumina-open src-qt5/core/lumina-open +#Core Utilities +lumina-config src-qt5/core-utils/lumina-config +lumina-search src-qt5/core-utils/lumina-search +lumina-xconfig src-qt5/core-utils/lumina-xconfig + +#Desktop Utilities +lumina-fm src-qt5/desktop-utils/lumina-fm +lumina-textedit src-qt5/desktop-utils/lumina-textedit +lumina-fileinfo src-qt5/desktop-utils/lumina-fileinfo +#lumina-terminal src-qt5/desktop-utils/lumina-terminal +lumina-screenshot src-qt5/desktop-utils/lumina-screenshot diff --git a/src-qt5/OS-detect.pri b/src-qt5/OS-detect.pri index e6f30255..0fb6e76d 100644 --- a/src-qt5/OS-detect.pri +++ b/src-qt5/OS-detect.pri @@ -23,9 +23,9 @@ isEmpty(OS){ message("Build OS Info: $${QMAKE_HOST.os}, $${QMAKE_HOST.arch}, $${QMAKE_HOST.version_string}") #Load the initial library/includefile search locations (more can be added in the OS-specific sections below) - LIBS = -L$${PWD}/libLumina -L$$[QT_INSTALL_LIBS] - INCLUDEPATH = $${PWD}/libLumina $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_PREFIX] - QMAKE_LIBDIR = $${PWD}/libLumina $$[QT_INSTALL_LIBS] $$LIBPREFIX/qt5 $$LIBPREFIX + LIBS = -L$${PWD}/core/libLumina -L$$[QT_INSTALL_LIBS] + INCLUDEPATH = $${PWD}/core/libLumina $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_PREFIX] + QMAKE_LIBDIR = $${PWD}/core/libLumina $$[QT_INSTALL_LIBS] $$LIBPREFIX/qt5 $$LIBPREFIX #Setup the default values for build settings (if not explicitly set previously) isEmpty(PREFIX){ PREFIX=/usr/local } |