SHARE
TWEET

Spacescape Linux Build Patch

a guest Feb 8th, 2012 148 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/trunk/CMake/FindPkgMacros.cmake b/trunk/CMake/FindPkgMacros.cmake
  2. index 0ca97dc..ec1f09d 100644
  3. --- a/trunk/CMake/FindPkgMacros.cmake
  4. +++ b/trunk/CMake/FindPkgMacros.cmake
  5. @@ -71,8 +71,6 @@ endmacro (use_pkgconfig)
  6.  macro(make_library_set PREFIX)
  7.    if (${PREFIX}_FWK)
  8.      set(${PREFIX} ${${PREFIX}_FWK})
  9. -  elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
  10. -    set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
  11.    elseif (${PREFIX}_REL)
  12.      set(${PREFIX} ${${PREFIX}_REL})
  13.    elseif (${PREFIX}_DBG)
  14.  
  15. diff --git a/trunk/Spacescape/external/QtPropertyBrowser/CMakeLists.txt b/trunk/Spacescape/external/QtPropertyBrowser/CMakeLists.txt
  16. index 78743e1..68f4e65 100644
  17. --- a/trunk/Spacescape/external/QtPropertyBrowser/CMakeLists.txt
  18. +++ b/trunk/Spacescape/external/QtPropertyBrowser/CMakeLists.txt
  19. @@ -12,7 +12,7 @@ ELSEIF(WIN32)
  20.         EXECUTE_PROCESS(COMMAND qmake qtpropertybrowser.pro WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
  21.         EXECUTE_PROCESS(COMMAND vcvars32-nmake.bat WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} RESULT_VARIABLE ret_var OUTPUT_VARIABLE ret_val ERROR_VARIABLE ret_val )
  22.  ENDIF(UNIX)
  23. -FIND_LIBRARY(QtPropertyBrowser_Library_DBG NAMES QtSolutions_PropertyBrowser-2.5d PATHS lib/)
  24. +FIND_LIBRARY(QtPropertyBrowser_Library_DBG NAMES QtSolutions_PropertyBrowser-2.5 PATHS lib/)
  25.  FIND_LIBRARY(QtPropertyBrowser_Library_REL NAMES QtSolutions_PropertyBrowser-2.5 PATHS lib/)
  26.  
  27.  IF(NOT QtPropertyBrowser_Library_REL)
  28. diff --git a/trunk/Spacescape/include/QtOgreWidget.h b/trunk/Spacescape/include/QtOgreWidget.h
  29. index 29e9f1e..6948b3d 100644
  30. --- a/trunk/Spacescape/include/QtOgreWidget.h
  31. +++ b/trunk/Spacescape/include/QtOgreWidget.h
  32. @@ -30,9 +30,6 @@ THE SOFTWARE.
  33.  #ifndef QtOgreWidget_H
  34.  #define QtOgreWidget_H
  35.  
  36. -#define Q_WS_MAC
  37. -#define Q_WS_MAC32
  38. -
  39.  #include <QWidget>
  40.  #if defined(Q_WS_WIN)
  41.  // disable some warning
  42. @@ -117,4 +114,4 @@ protected:
  43.  #endif
  44.  };
  45.  
  46. -#endif
  47. \ No newline at end of file
  48. +#endif
  49. diff --git a/trunk/Spacescape/include/QtSpacescapeWidget.h b/trunk/Spacescape/include/QtSpacescapeWidget.h
  50. index 24587ee..86bda09 100644
  51. --- a/trunk/Spacescape/include/QtSpacescapeWidget.h
  52. +++ b/trunk/Spacescape/include/QtSpacescapeWidget.h
  53. @@ -30,11 +30,11 @@ THE SOFTWARE.
  54.  #ifndef QtSpacescapeWidget_H
  55.  #define QtSpacescapeWidget_H
  56.  
  57. -//#if defined(Q_WS_MAC)
  58. +#if defined(Q_WS_MAC)
  59.  #include "QtOgreWidgetOSX.h"
  60. -//#else
  61. -//#include "QtOgreWidget.h"
  62. -//#endif
  63. +#else
  64. +#include "QtOgreWidget.h"
  65. +#endif
  66.  #include "SpacescapePlugin.h"
  67.  #include "SpacescapeLayer.h"
  68.  
  69. diff --git a/trunk/Spacescape/src/QtOgreWidget.cpp b/trunk/Spacescape/src/QtOgreWidget.cpp
  70. index e2c05ce..0948b37 100644
  71. --- a/trunk/Spacescape/src/QtOgreWidget.cpp
  72. +++ b/trunk/Spacescape/src/QtOgreWidget.cpp
  73. @@ -42,7 +42,7 @@ Ogre::Root * QtOgreWidget::mOgreRoot = NULL;
  74.  /** Constructor
  75.  @param parent
  76.  */
  77. -QtOgreWidget::QtOgreWidget(QWidget *parent) : QWidget(parent) {
  78. +QtOgreWidget::QtOgreWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent) {
  79.         setAttribute(Qt::WA_PaintOnScreen);
  80.         setAttribute(Qt::WA_NoBackground);
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