Ticket #28806: patch-qgle-glu.diff

File patch-qgle-glu.diff, 930 bytes (added by jdswinbank (John Swinbank), 12 years ago)

  • src/gui/3dviewer.cpp 

    diff --git a/src/gui/3dviewer.cpp b/src/gui/3dviewer.cpp
index 7a016bb..00e14e6 100644
     
    2727#include "../gle/gle-block.h"
    2828#include "../gle/surface/gsurface.h"
    2929
    30 #ifdef HAVE_LIBGLU_H
    31         #include <GL/glu.h>
    32 #endif
    33 
     30#include <glu.h>
    3431#include <math.h>
    3532
    3633QGLE3DWidget::QGLE3DWidget(QWidget *parent, GLEInterface* iface)

  • src/gui/qgle.pro.in 

    diff --git a/src/gui/qgle.pro.in b/src/gui/qgle.pro.in
index cd33a61..46d350b 100644
    macx { 
    129129    ICON      += images/gle.icns
    130130    SOURCES   += macspecific.cpp
    131131    LIBS      += -framework Carbon
     132    LIBS      += -framework OpenGL
    132133}
    133134
    134135DISTFILES += readme.txt \
    … … DESTDIR = ../../build/bin 
    177178
    178179# add the "lib" directory to the search path of the linker
    179180unix {
    180         LIBS += @QT_RPATH@ @QT_LIBGLU_LIB@
     181        LIBS += @QT_RPATH@
    181182}
    182183
    183184QMAKE_CXXFLAGS += @QT_CPPFLAGS@