Changeset aa64b60a


Ignore:
Timestamp:
04/25/14 13:52:10 (17 months ago)
Author:
Ken Moore <moorekou@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2, releng/10.2, stable/10
Children:
1b0a2e4
Parents:
3dab665 (diff), f12e79a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge pull request #35 from jpsutton/master

modifications to support Linux compilation

Location:
lumina
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • lumina/lumina-config/lumina-config.pro

    r768b81c rf12e79a  
    1717 
    1818INCLUDEPATH += ../libLumina /usr/local/include 
    19 LIBS     += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head 
     19 
     20linux-g++ { 
     21  LIBS     += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-2.6 
     22} else { 
     23  LIBS     += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head 
     24} 
    2025 
    2126TRANSLATIONS =  i18n/lumina-config_af.ts \ 
  • lumina/lumina-config/main.cpp

    rdcb7f23 rf12e79a  
    11#include <QTranslator> 
    2 #include <qtsingleapplication.h> 
     2#ifdef __linux 
     3  #include <QtSolutions/qtsingleapplication.h> 
     4#else 
     5  #include <qtsingleapplication.h> 
     6#endif // #ifdef __linux 
    37#include <QtGui/QApplication> 
    48#include <QDebug> 
  • lumina/lumina-desktop/Globals.h

    rec454bd rf12e79a  
    99 
    1010#include <unistd.h> 
     11 
     12#ifdef __linux 
     13  // Needed for BUFSIZ 
     14  #include <stdio.h> 
     15#endif // #ifdef __linux 
    1116 
    1217class Lumina{ 
     
    3035        } 
    3136        //Shutdown the system 
     37#ifdef __linux 
     38        static void shutdown(){ system("(shutdown -h now) &"); } 
     39#else // #ifdef __linux 
    3240        static void shutdown(){ system("(shutdown -p now) &"); } 
     41#endif // #ifdef __linux 
    3342        //Restart the system 
    3443        static void restart(){ system("(shutdown -r now) &"); } 
Note: See TracChangeset for help on using the changeset viewer.