diff options
| author | Ken Moore <ken@pcbsd.org> | 2014-09-29 10:22:48 -0400 |
|---|---|---|
| committer | Ken Moore <ken@pcbsd.org> | 2014-09-29 10:22:48 -0400 |
| commit | 68977d5a80255861a1d89eb1b2390af2860259ab (patch) | |
| tree | bc72a000a9ee67244ce0f092dfdb33db88322ca6 /lumina-fm | |
| parent | A few updates to plugins: (diff) | |
| parent | Merge pull request #13 from slicer69/master (diff) | |
| download | lumina-68977d5a80255861a1d89eb1b2390af2860259ab.tar.gz lumina-68977d5a80255861a1d89eb1b2390af2860259ab.tar.bz2 lumina-68977d5a80255861a1d89eb1b2390af2860259ab.zip | |
Merge branch 'master' of github.com:pcbsd/lumina
Diffstat (limited to 'lumina-fm')
| -rw-r--r-- | lumina-fm/lumina-fm.pro | 5 | ||||
| -rw-r--r-- | lumina-fm/main.cpp | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/lumina-fm/lumina-fm.pro b/lumina-fm/lumina-fm.pro index e004de17..afe46993 100644 --- a/lumina-fm/lumina-fm.pro +++ b/lumina-fm/lumina-fm.pro @@ -24,10 +24,9 @@ FORMS += MainUI.ui \ INCLUDEPATH += ../libLumina /usr/local/include -linux-* { LIBS += -L../libLumina -lLuminaUtils -} else { - LIBS += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head +freebsd-* { + LIBS += -lQtSolutions_SingleApplication-head } openbsd-g++4 { diff --git a/lumina-fm/main.cpp b/lumina-fm/main.cpp index d15a81d3..4c23366a 100644 --- a/lumina-fm/main.cpp +++ b/lumina-fm/main.cpp @@ -1,9 +1,7 @@ #include <QTranslator> -#ifdef __linux - // #include <QtSolutions/qtsingleapplication.h> -#else +#ifdef __FreeBSD__ #include <qtsingleapplication.h> -#endif // #ifdef __linux +#endif #include <QtGui/QApplication> #include <QDebug> #include <QFile> @@ -22,13 +20,13 @@ int main(int argc, char ** argv) in << QString(argv[i]); } if(in.isEmpty()){ in << QDir::homePath(); } - #ifdef __linux - QApplication a(argc, argv); - #else + #ifdef __FreeBSD__ QtSingleApplication a(argc, argv); if( a.isRunning() ){ return !(a.sendMessage(in.join("\n"))); } + #else + QApplication a(argc, argv); #endif a.setApplicationName("Insight File Manager"); //Load current Locale |