daily pastebin goal
59%
SHARE
TWEET

Untitled

a guest Jan 12th, 2018 57 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/eiskaltdcpp-qt/CMakeLists.txt b/eiskaltdcpp-qt/CMakeLists.txt
  2. index c6ac07e..d56d10a 100644
  3. --- a/eiskaltdcpp-qt/CMakeLists.txt
  4. +++ b/eiskaltdcpp-qt/CMakeLists.txt
  5. @@ -110,8 +110,11 @@ set (SRCS
  6.              src/WulforSettings.cpp
  7.              src/WulforUtil.cpp
  8.              src/ChatEdit.cpp
  9. -            src/qtsingleapp/qtsinglecoreapplication.cpp
  10. -            )
  11. +           )
  12. +if (NOT HAIKU)
  13. +    set (SRCS ${SRCS} src/qtsingleapp/qtsinglecoreapplication.cpp)
  14. +endif (NOT HAIKU)
  15. +            
  16.  set (MOC_HDRS
  17.              src/ActionCustomizer.h
  18.              src/ADLS.h
  19. @@ -184,8 +187,11 @@ set (MOC_HDRS
  20.              src/WulforSettings.h
  21.              src/WulforUtil.h
  22.              src/ChatEdit.h
  23. -            src/qtsingleapp/qtsinglecoreapplication.h
  24. -            )
  25. +           )
  26. +if (NOT HAIKU)
  27. +           set (MOC_HDRS ${MOC_HDRS} src/qtsingleapp/qtsinglecoreapplication.h)
  28. +endif (NOT HAIKU)
  29. +            
  30.  set (UI_FORMS ui/UIAbout.ui
  31.              ui/UIAntiSpam.ui
  32.              ui/UIADLSearch.ui
  33. @@ -313,6 +319,7 @@ if (UNIX)
  34.                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/)
  35.  endif (UNIX)
  36.  
  37. +
  38.  EXECUTE_PROCESS (
  39.      COMMAND ${QT_RCC_EXECUTABLE} -binary  ${DEFAULT_QRC_FILE} -o ${PROJECT_BINARY_DIR}/default.rcc
  40.      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
  41. @@ -402,6 +409,10 @@ else (APPLE)
  42.    target_link_libraries (eiskaltdcpp-qt ${LIBS} dcpp)
  43.  endif (APPLE)
  44.  
  45. +if (HAIKU)
  46. +  target_link_libraries (eiskaltdcpp-qt ${LIBS} network locale be tracker)
  47. +endif (HAIKU)
  48. +
  49.  if (APPLE)
  50.    set_property (TARGET eiskaltdcpp-qt PROPERTY OUTPUT_NAME "${PROJECT_NAME_GLOBAL}")
  51.  else (APPLE)
  52. @@ -489,4 +500,10 @@ if (APPLE)
  53.  
  54.  endif (APPLE)
  55.  
  56. +if (HAIKU)
  57. +  EXECUTE_PROCESS (
  58. +                COMMAND rc -o ${PROJECT_BINARY_DIR}/haiku.rsrc ../haiku/haiku.rdef
  59. +               COMMAND xres -o ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt ${PROJECT_BINARY_DIR}/haiku.rsrc)
  60. +endif (HAIKU)
  61. +
  62.  include(CPack)
  63. diff --git a/eiskaltdcpp-qt/src/main.cpp b/eiskaltdcpp-qt/src/main.cpp
  64. index d74609b..e03c7f7 100644
  65. --- a/eiskaltdcpp-qt/src/main.cpp
  66. +++ b/eiskaltdcpp-qt/src/main.cpp
  67. @@ -88,6 +88,7 @@ int main(int argc, char *argv[])
  68.  
  69.      parseCmdLine(app.arguments());
  70.  
  71. +#ifndef Q_WS_HAIKU
  72.      if (app.isRunning()){
  73.          QStringList args = app.arguments();
  74.          args.removeFirst();//remove path to executable
  75. @@ -96,6 +97,7 @@ int main(int argc, char *argv[])
  76.  
  77.          return 0;
  78.      }
  79. +#endif    
  80.  
  81.  #if !defined (Q_WS_WIN) && !defined (Q_WS_HAIKU)
  82.      installHandlers();
  83. @@ -136,7 +138,9 @@ int main(int argc, char *argv[])
  84.      MainWindow::newInstance();
  85.      MainWindow::getInstance()->setUnload(!WBGET(WB_TRAY_ENABLED));
  86.  
  87. +#ifndef Q_WS_HAIKU
  88.      app.connect(&app, SIGNAL(messageReceived(QString)), MainWindow::getInstance(), SLOT(parseInstanceLine(QString)));
  89. +#endif
  90.  
  91.      HubManager::newInstance();
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top