diff options
| -rw-r--r-- | libLumina/libLumina.pro | 2 | ||||
| -rw-r--r-- | lumina-config/lumina-config.pro | 12 | ||||
| -rw-r--r-- | lumina-desktop/lumina-desktop.pro | 9 | ||||
| -rw-r--r-- | lumina-fm/lumina-fm.pro | 6 | ||||
| -rw-r--r-- | lumina-open/lumina-open.pro | 12 | ||||
| -rw-r--r-- | lumina-screenshot/lumina-screenshot.pro | 8 | ||||
| -rw-r--r-- | lumina-search/lumina-search.pro | 8 |
7 files changed, 37 insertions, 20 deletions
diff --git a/libLumina/libLumina.pro b/libLumina/libLumina.pro index 5b9cfe6c..0302b825 100644 --- a/libLumina/libLumina.pro +++ b/libLumina/libLumina.pro @@ -65,4 +65,4 @@ themes.files=themes/Lumina-default.qss.template \ INSTALLS += target include colors themes -QMAKE_LIBDIR = $$LIBPREFIX/qt4 $$LIBPREFIX +QMAKE_LIBDIR = $$LIBPREFIX/qt5 $$LIBPREFIX diff --git a/lumina-config/lumina-config.pro b/lumina-config/lumina-config.pro index 821daf05..ba2e96cf 100644 --- a/lumina-config/lumina-config.pro +++ b/lumina-config/lumina-config.pro @@ -8,6 +8,10 @@ isEmpty(PREFIX) { } target.path = $$PREFIX/bin +isEmpty(LIBPREFIX) { + LIBPREFIX = $$PREFIX/lib +} + TEMPLATE = app SOURCES += main.cpp \ @@ -34,13 +38,9 @@ FORMS += mainUI.ui \ INCLUDEPATH += ../libLumina $$PREFIX/include -LIBS += -L../libLumina -L$$PREFIX/lib -lLuminaUtils +LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -openbsd-g++4 { - LRELEASE = lrelease4 -} else { - LRELEASE = $$PREFIX/lib/qt5/bin/lrelease -} +LRELEASE = $$LIBPREFIX/qt5/bin/lrelease QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro index 4b232de2..5258eca3 100644 --- a/lumina-desktop/lumina-desktop.pro +++ b/lumina-desktop/lumina-desktop.pro @@ -8,16 +8,21 @@ isEmpty(PREFIX) { } target.path = $$PREFIX/bin -LIBS += -L../libLumina -L$$PREFIX/lib -lLuminaUtils -lXdamage -lX11 -lxcb -lxcb-damage +isEmpty(LIBPREFIX) { + LIBPREFIX = $$PREFIX/lib +} + +LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -lXdamage -lX11 -lxcb -lxcb-damage QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina TEMPLATE = app -LRELEASE = $$PREFIX/lib/qt5/bin/lrelease +LRELEASE = $$LIBPREFIX/qt5/bin/lrelease SOURCES += main.cpp \ WMProcess.cpp \ + LXcbEventFilter.cpp \ LSession.cpp \ LDesktop.cpp \ LPanel.cpp \ diff --git a/lumina-fm/lumina-fm.pro b/lumina-fm/lumina-fm.pro index b7653274..5845bb88 100644 --- a/lumina-fm/lumina-fm.pro +++ b/lumina-fm/lumina-fm.pro @@ -8,6 +8,10 @@ isEmpty(PREFIX) { } target.path = $$PREFIX/bin +isEmpty(LIBPREFIX) { + LIBPREFIX = $$PREFIX/lib +} + TEMPLATE = app SOURCES += main.cpp \ @@ -30,7 +34,7 @@ FORMS += MainUI.ui \ INCLUDEPATH += ../libLumina $$PREFIX/include -LIBS += -L../libLumina -L$$PREFIX/lib -lLuminaUtils +LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils openbsd-g++4 { LRELEASE = lrelease4 diff --git a/lumina-open/lumina-open.pro b/lumina-open/lumina-open.pro index d713c4c2..37f55e32 100644 --- a/lumina-open/lumina-open.pro +++ b/lumina-open/lumina-open.pro @@ -8,6 +8,10 @@ isEmpty(PREFIX) { } target.path = $$PREFIX/bin +isEmpty(LIBPREFIX) { + LIBPREFIX = $$PREFIX/lib +} + TEMPLATE = app SOURCES += main.cpp \ @@ -20,15 +24,11 @@ FORMS += LFileDialog.ui RESOURCES+= lumina-open.qrc INCLUDEPATH += ../libLumina $$PREFIX/include -LIBS += -L../libLumina -L$$PREFIX/lib -lLuminaUtils +LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina -openbsd-g++4 { - LRELEASE = lrelease4 -} else { - LRELEASE = $$PREFIX/lib/qt5/bin/lrelease -} +LRELEASE = $$LIBPREFIX/qt5/bin/lrelease TRANSLATIONS = i18n/lumina-open_af.ts \ i18n/lumina-open_ar.ts \ diff --git a/lumina-screenshot/lumina-screenshot.pro b/lumina-screenshot/lumina-screenshot.pro index 7a47f7fe..ed1979bf 100644 --- a/lumina-screenshot/lumina-screenshot.pro +++ b/lumina-screenshot/lumina-screenshot.pro @@ -8,6 +8,10 @@ isEmpty(PREFIX) { } target.path = $$PREFIX/bin +isEmpty(LIBPREFIX) { + LIBPREFIX = $$PREFIX/lib +} + TEMPLATE = app SOURCES += main.cpp \ @@ -19,9 +23,9 @@ FORMS += MainUI.ui INCLUDEPATH += ../libLumina $$PREFIX/include -LIBS += -L../libLumina -L$$PREFIX/lib -lLuminaUtils +LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -LRELEASE = $$PREFIX/lib/qt5/bin/lrelease +LRELEASE = $$LIBPREFIX/qt5/bin/lrelease QMAKE_LIBDIR = ../libLumina diff --git a/lumina-search/lumina-search.pro b/lumina-search/lumina-search.pro index dba757dc..410592d3 100644 --- a/lumina-search/lumina-search.pro +++ b/lumina-search/lumina-search.pro @@ -8,6 +8,10 @@ isEmpty(PREFIX) { } target.path = $$PREFIX/bin +isEmpty(LIBPREFIX) { + LIBPREFIX = $$PREFIX/lib +} + TEMPLATE = app SOURCES += main.cpp \ @@ -21,9 +25,9 @@ FORMS += MainUI.ui INCLUDEPATH += ../libLumina $$PREFIX/include -LIBS += -L../libLumina -L$$PREFIX/lib -lLuminaUtils +LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -LRELEASE = $$PREFIX/lib/qt5/bin/lrelease +LRELEASE = $$LIBPREFIX/qt5/bin/lrelease QMAKE_LIBDIR = ../libLumina |