Revision: 44575
http://brlcad.svn.sourceforge.net/brlcad/?rev=44575&view=rev
Author: erikgreenwald
Date: 2011-05-05 20:58:30 +0000 (Thu, 05 May 2011)
Log Message:
-----------
wire in wglext.h if possible
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/src/other/togl/src/toglWGL.c
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2011-05-05 20:58:13 UTC (rev 44574)
+++ brlcad/trunk/CMakeLists.txt 2011-05-05 20:58:30 UTC (rev 44575)
@@ -888,12 +888,13 @@
BRLCAD_INCLUDE_FILE(dirent.h HAVE_DIRENT_H)
# Need to compare this with the configure.ac list
-BRLCAD_INCLUDE_FILE(GL/glext.h HAVE_GL_GLEXT_H)
BRLCAD_INCLUDE_FILE(arpa/inet.h HAVE_ARPA_INET_H)
BRLCAD_INCLUDE_FILE(dlfcn.h HAVE_DLFCN_H)
BRLCAD_INCLUDE_FILE(dslib.h HAVE_DSLIB_H)
BRLCAD_INCLUDE_FILE(getopt.h HAVE_GETOPT_H)
BRLCAD_INCLUDE_FILE(gl/device.h HAVE_GL_DEVICE_H)
+BRLCAD_INCLUDE_FILE(gl/glext.h HAVE_GL_GLEXT_H)
+BRLCAD_INCLUDE_FILE(gl/wglext.h HAVE_GL_WGLEXT_H)
BRLCAD_INCLUDE_FILE(grp.h HAVE_GRP_H)
BRLCAD_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H)
BRLCAD_INCLUDE_FILE(io.h HAVE_IO_H)
Modified: brlcad/trunk/src/other/togl/src/toglWGL.c
===================================================================
--- brlcad/trunk/src/other/togl/src/toglWGL.c 2011-05-05 20:58:13 UTC (rev
44574)
+++ brlcad/trunk/src/other/togl/src/toglWGL.c 2011-05-05 20:58:30 UTC (rev
44575)
@@ -12,12 +12,18 @@
/* TODO: fullscreen support */
+#include "brlcad_config.h"
+
#include <windows.h>
#include <GL/gl.h>
#include <wingdi.h>
#include <tk.h>
#include <tkPlatDecls.h>
-#include <GL/wglext.h>
+#ifdef HAVE_GL_WGLEXT_H
+# include <GL/wglext.h>
+#else
+# include "./wglext.h"
+#endif
#ifndef PFD_SUPPORT_COMPOSITION
/* for Vista -- not needed because we don't use PFD_SUPPORT_GDI/BITMAP */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
