Changeset 9e67ef75


Ignore:
Timestamp:
05/02/14 05:36:41 (8 months ago)
Author:
Jesse <slicer69@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
eaea8ff, 4a7afa06
Parents:
cfbd8452
Message:

Modified lumina-config/main.cpp, lumina-destop/WMProcess.cpp to avoid compile errors on Linux. Modified project files to detect Linux and adjust targets accordingly.

Location:
lumina
Files:
4 edited

Legend:

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

    rf12e79a r9e67ef75  
    1818INCLUDEPATH += ../libLumina /usr/local/include 
    1919 
    20 linux-g++ { 
    21   LIBS     += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-2.6 
     20linux-g++-64 { 
     21  LIBS     += -L../libLumina -lLuminaUtils  
    2222} else { 
    2323  LIBS     += -L../libLumina -lLuminaUtils -lQtSolutions_SingleApplication-head 
  • lumina/lumina-config/main.cpp

    rf12e79a r9e67ef75  
    11#include <QTranslator> 
    22#ifdef __linux 
    3   #include <QtSolutions/qtsingleapplication.h> 
     3   // #include <QtSolutions/qtsingleapplication.h> 
    44#else 
    55  #include <qtsingleapplication.h> 
     
    1717int main(int argc, char ** argv) 
    1818{ 
     19    #ifdef __linux 
     20    QApplication a(argc, argv); 
     21    #else 
    1922    QtSingleApplication a(argc, argv); 
    2023    if( a.isRunning() ) 
    2124      return !(a.sendMessage("show")); 
    22      
     25    #endif 
    2326    QTranslator translator; 
    2427    QLocale mylocale; 
  • lumina/lumina-desktop/WMProcess.cpp

    r4565b4c r9e67ef75  
    6666    //if(QFile::exists(confDir+"/rc.xml")){ QFile::rename(confDir+"/rc.xml",confDir+"/openbox-rc.xml"); } 
    6767    //QFile::copy(confDir+"/lumina-rc.xml",confDir+"/rc.xml"); 
     68    #ifdef __linux 
     69    cmd = "/usr/bin/openbox --debug --sm-disable --config-file "+confDir+"/lumina-rc.xml"; 
     70    #else 
    6871    cmd = "/usr/local/bin/openbox --debug --sm-disable --config-file "+confDir+"/lumina-rc.xml"; 
     72    #endif 
    6973  }else if(WM=="fluxbox"){ 
    7074    QString confDir = QDir::homePath()+"/.lumina"; 
     
    7882      QFile::setPermissions(confDir+"/lumina-menu.xml", QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup); 
    7983    }*/ 
     84    #ifdef __linux 
     85    cmd = "/usr/bin/fluxbox -rc "+confDir+"/fluxbox-init-rc"; 
     86    #else 
    8087    cmd = "/usr/local/bin/fluxbox -rc "+confDir+"/fluxbox-init-rc"; 
     88    #endif 
    8189  } 
    8290  return cmd; 
  • lumina/lumina-desktop/lumina-desktop.pro

    radfee31 r9e67ef75  
    5858 
    5959desktop.files = Lumina-DE.desktop 
     60linux-g++-64 { 
     61desktop.path = /usr/share/xsessions 
     62} else { 
    6063desktop.path = /usr/local/share/xsessions 
     64} 
    6165 
    6266icons.files = Lumina-DE.png 
Note: See TracChangeset for help on using the changeset viewer.