luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.QT4.OPENGL]

Browse source 
* BUG: Remove OpenGL detection, as QtOpenGL implies that GL files and support are presents.


git-svn-id: svn://localhost/gambas/trunk@2528 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Laurent Carlier 2009-12-28 00:30:46 +00:00
parent bc0d1f80ee
commit 438c6be3ef
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gb.qt4/configure.ac
View file

@ -42,15 +42,6 @@ GB_COMPONENT_PKG_CONFIG(
QtCore ">= 4.3.4" QtGui QtNetwork QtDBus QtXml QtWebKit ">= 4.5.0" QtCore ">= 4.3.4" QtGui QtNetwork QtDBus QtXml QtWebKit ">= 4.5.0"
) )
GB_COMPONENT(
opengl,
OPENGL,
[OpenGL libraries],
[],
[GB_FIND(gl.h glu.h, /usr /usr/X11R6 /usr/local, include/GL)],
[GB_FIND(libGL.$SHLIBEXT libGLU.$SHLIBEXT, /usr /usr/X11R6 /usr/local, lib)],
[-lGL -lGLU])
GB_COMPONENT_PKG_CONFIG( GB_COMPONENT_PKG_CONFIG(
qtopengl, qtopengl,
QTOPENGL, QTOPENGL,

6
gb.qt4/src/opengl/Makefile.am
View file

@ -2,12 +2,12 @@ COMPONENT = gb.qt4.opengl
include $(top_srcdir)/component.am include $(top_srcdir)/component.am
include $(top_srcdir)/gb.qt.am include $(top_srcdir)/gb.qt.am
INCLUDES = -DQT3_SUPPORT @QT_INC@ @OPENGL_INC@ @QTOPENGL_INC@ INCLUDES = -DQT3_SUPPORT @QT_INC@ @QTOPENGL_INC@
gblib_LTLIBRARIES = gb.qt4.opengl.la gblib_LTLIBRARIES = gb.qt4.opengl.la
gb_qt4_opengl_la_LIBADD = @QT_LIB@ @OPENGL_LIB@ @QTOPENGL_LIB@ gb_qt4_opengl_la_LIBADD = @QT_LIB@ @QTOPENGL_LIB@
gb_qt4_opengl_la_LDFLAGS = -module @LD_FLAGS@ @QT_LDFLAGS@ @OPENGL_LDFLAGS@ @QTOPENGL_LDFLAGS@ gb_qt4_opengl_la_LDFLAGS = -module @LD_FLAGS@ @QT_LDFLAGS@ @QTOPENGL_LDFLAGS@
gb_qt4_opengl_la_SOURCES = \ gb_qt4_opengl_la_SOURCES = \
main.h main.cpp \ main.h main.cpp \