aboutsummaryrefslogtreecommitdiff
path: root/lumina-config
diff options
context:
space:
mode:
authorKen Moore <moorekou@gmail.com>2014-09-25 08:19:21 -0400
committerKen Moore <moorekou@gmail.com>2014-09-25 08:19:21 -0400
commitedb4e35a6c615f21c45897f8ad7d2558fcb71ef4 (patch)
tree0a8f7158000d15d8af70ecbd401475f0cc341100 /lumina-config
parentMerge pull request #12 from slicer69/master (diff)
parentAdded initial support for Debian/kFreeBSD. This patch has been tested (diff)
downloadlumina-edb4e35a6c615f21c45897f8ad7d2558fcb71ef4.tar.gz
lumina-edb4e35a6c615f21c45897f8ad7d2558fcb71ef4.tar.bz2
lumina-edb4e35a6c615f21c45897f8ad7d2558fcb71ef4.zip
Merge pull request #13 from slicer69/master
Added initial support for Debian/kFreeBSD
Diffstat (limited to 'lumina-config')
-rw-r--r--lumina-config/lumina-config.pro10
-rw-r--r--lumina-config/main.cpp9
2 files changed, 10 insertions, 9 deletions
diff --git a/lumina-config/lumina-config.pro b/lumina-config/lumina-config.pro
index f79deeef..766448d8 100644
--- a/lumina-config/lumina-config.pro
+++ b/lumina-config/lumina-config.pro
@@ -22,10 +22,12 @@ FORMS += mainUI.ui \
INCLUDEPATH += ../libLumina /usr/local/include
-linux-* {
- LIBS += -L../libLumina -lLuminaUtils
-} else {
- LIBS += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head
+ LIBS += -L../libLumina -lLuminaUtils
+freebsd-* {
+ LIBS += -lQtSolutions_SingleApplication-head
+}
+openbsd-g++4 {
+ LIBS += -lQtSolutions_SingleApplication-head
}
openbsd-g++4 {
diff --git a/lumina-config/main.cpp b/lumina-config/main.cpp
index c6525014..d1cb2004 100644
--- a/lumina-config/main.cpp
+++ b/lumina-config/main.cpp
@@ -1,9 +1,8 @@
#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>
@@ -16,7 +15,7 @@
int main(int argc, char ** argv)
{
- #ifdef __linux
+ #ifndef __FreeBSD__
QApplication a(argc, argv);
#else
QtSingleApplication a(argc, argv);
bgstack15