diff options
| author | José Fonseca <jfonseca@vmware.com> | 2011-06-06 15:31:54 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2011-06-06 15:31:54 +0100 |
| commit | df8fdd4a5053f5d8dbcdf9991f9ca21e64dece28 (patch) | |
| tree | cca200386c73238b38011af1a031397376c36e33 | |
| parent | 6a6dd4cc9df558a63584d1841ed88345d7f6a774 (diff) | |
cmake: Build X11 programs on MacOSX.
On Mac OS X, GLX is provided as a separate OpenGL implementation, different
from the standard OpenGL framework which provides support for GLUT and native
Mac OS X applications.
49 files changed, 148 insertions, 105 deletions
@@ -1,5 +1,9 @@ .*.sw? *.a +*.bz2 +*.dmg +*.la +*.lo *.o *.obj *.os @@ -7,30 +11,35 @@ *.pdb *.pyc *.pyo -*.la -*.lo *.so +*.zip *~ .deps .libs -depend -depend.bak -cmake_install.cmake CMakeCache.txt CMakeFiles -compile -configure -autom4te.cache +CPackConfig.cmake +CPackSourceConfig.cmake +Makefile +Makefile.in +_CPack_Packages/ aclocal.m4 +autom4te.cache build +cmake_install.cmake +compile config.guess config.log config.status config.sub +configure configure.lineno cscope* depcomp +depend +depend.bak install-sh +install_manifest.txt libtool libtool.m4 ltmain.sh @@ -39,5 +48,3 @@ ltsugar.m4 ltversion.m4 lt~obsolete.m4 missing -Makefile -Makefile.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 4404bc69..240018d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,36 @@ if (UNIX) link_libraries(m) endif (UNIX) +# On Mac OS X, GLX is provided as a separate OpenGL implementation, different +# from the standard OpenGL framework which provides support for GLUT and native +# Mac OS X applications. +if (X11_FOUND) + if (X11_FOUND) + find_path (X11_GL_INCLUDE_PATH GL/glx.h ${X11_INC_SEARCH_PATH}) + if (NOT X11_GL_INCLUDE_PATH) + message (WARNING "Could not find GL/glx.h") + set (X11_FOUND FALSE) + endif (NOT X11_GL_INCLUDE_PATH) + set (X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_GL_INCLUDE_PATH}) + + find_library (X11_GL_LIB GL ${X11_LIB_SEARCH_PATH}) + if (NOT X11_GL_LIB) + message (WARNING "Could not find libGL.dylib") + set (X11_FOUND FALSE) + endif (NOT X11_GL_LIB) + + find_library (X11_GLU_LIB GLU ${X11_LIB_SEARCH_PATH}) + if (NOT X11_GLU_LIB) + message (WARNING "Could not find libGLU.dylib") + set (X11_FOUND FALSE) + endif (NOT X11_GLU_LIB) + else () + set (X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) + set (X11_GL_LIB ${OPENGL_gl_LIBRARY}) + set (X11_GLU_LIB ${OPENGL_glu_LIBRARY}) + endif () +endif (X11_FOUND) + if (WIN32) # Nobody likes to include windows.h: # - Microsoft's GL/gl.h header depends on windows.h but doesn't include it; diff --git a/src/demos/CMakeLists.txt b/src/demos/CMakeLists.txt index 77c36d2c..e62e770e 100644 --- a/src/demos/CMakeLists.txt +++ b/src/demos/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/fp/CMakeLists.txt b/src/fp/CMakeLists.txt index 44cf5e2a..a8aaad20 100644 --- a/src/fp/CMakeLists.txt +++ b/src/fp/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/fpglsl/CMakeLists.txt b/src/fpglsl/CMakeLists.txt index c7efb2cf..deb335bb 100644 --- a/src/fpglsl/CMakeLists.txt +++ b/src/fpglsl/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/glsl/CMakeLists.txt b/src/glsl/CMakeLists.txt index ef2f1bae..39a6ff0b 100644 --- a/src/glsl/CMakeLists.txt +++ b/src/glsl/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/gs/CMakeLists.txt b/src/gs/CMakeLists.txt index 2de72cb4..eef685d0 100644 --- a/src/gs/CMakeLists.txt +++ b/src/gs/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/objviewer/CMakeLists.txt b/src/objviewer/CMakeLists.txt index beaa0cbd..fc617200 100644 --- a/src/objviewer/CMakeLists.txt +++ b/src/objviewer/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/perf/CMakeLists.txt b/src/perf/CMakeLists.txt index ecd4216f..68b6875d 100644 --- a/src/perf/CMakeLists.txt +++ b/src/perf/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/redbook/CMakeLists.txt b/src/redbook/CMakeLists.txt index 3311d993..37201af4 100644 --- a/src/redbook/CMakeLists.txt +++ b/src/redbook/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt index 3ac7771e..b83ee916 100644 --- a/src/samples/CMakeLists.txt +++ b/src/samples/CMakeLists.txt @@ -1,20 +1,16 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( util - ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} - ${GLEW_glew_LIBRARY} ) set (subdir samples) @@ -54,6 +50,12 @@ set (targets foreach (target ${targets}) add_executable (${subdir}_${target} ${target}.c) set_target_properties (${subdir}_${target} PROPERTIES OUTPUT_NAME ${target}) + target_link_libraries (${subdir}_${target} + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} + ${GLUT_glut_LIBRARY} + ${GLEW_glew_LIBRARY} + ) install (TARGETS ${subdir}_${target} DESTINATION ${subdir}) endforeach (target) @@ -62,18 +64,19 @@ if (X11_FOUND) ${X11_INCLUDE_DIR} ) - link_libraries ( - ${X11_Xext_LIB} - ${X11_X11_LIB} - ) - - set (xtargets + set (targets oglinfo ) - foreach (xtarget ${xtargets}) - add_executable (${xtarget} ${xtarget}.c) - endforeach (xtarget) - - install (TARGETS ${xtargets} DESTINATION ${subdir}) + foreach (target ${targets}) + add_executable (${subdir}_${target} ${target}.c) + set_target_properties (${subdir}_${target} PROPERTIES OUTPUT_NAME ${target}) + target_link_libraries (${subdir}_${target} + ${X11_GLU_LIB} + ${X11_GL_LIB} + ${X11_Xext_LIB} + ${X11_X11_LIB} + ) + install (TARGETS ${subdir}_${target} DESTINATION ${subdir}) + endforeach (target) endif (X11_FOUND) diff --git a/src/samples/oglinfo.c b/src/samples/oglinfo.c index eb90de70..f3b6a34b 100644 --- a/src/samples/oglinfo.c +++ b/src/samples/oglinfo.c @@ -6,7 +6,7 @@ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <stdio.h> #include <string.h> diff --git a/src/slang/CMakeLists.txt b/src/slang/CMakeLists.txt index 4d91366d..8e5c7e10 100644 --- a/src/slang/CMakeLists.txt +++ b/src/slang/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 8335ff29..d64bc230 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,20 +1,16 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( util - ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} - ${GLEW_glew_LIBRARY} ) set (subdir tests) @@ -141,6 +137,12 @@ endif (UNIX) foreach (target ${targets}) add_executable (${subdir}_${target} ${target}.c) set_target_properties (${subdir}_${target} PROPERTIES OUTPUT_NAME ${target}) + target_link_libraries (${subdir}_${target} + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} + ${GLUT_glut_LIBRARY} + ${GLEW_glew_LIBRARY} + ) install (TARGETS ${subdir}_${target} DESTINATION ${subdir}) endforeach (target) @@ -149,21 +151,23 @@ if (X11_FOUND) ${X11_INCLUDE_DIR} ) - link_libraries ( - ${X11_Xext_LIB} - ${X11_X11_LIB} - ) - - set (xtargets + set (targets auxbuffer jkrahntest sharedtex texobjshare ) - foreach (xtarget ${xtargets}) - add_executable (${xtarget} ${xtarget}.c) - endforeach (xtarget) - - install (TARGETS ${xtargets} DESTINATION ${subdir}) + foreach (target ${targets}) + add_executable (${subdir}_${target} ${target}.c) + set_target_properties (${subdir}_${target} PROPERTIES OUTPUT_NAME ${target}) + target_link_libraries (${subdir}_${target} + ${GLEW_glew_LIBRARY} + ${X11_GLU_LIB} + ${X11_GL_LIB} + ${X11_Xext_LIB} + ${X11_X11_LIB} + ) + install (TARGETS ${subdir}_${target} DESTINATION ${subdir}) + endforeach (target) endif (X11_FOUND) diff --git a/src/tests/getprocaddress.c b/src/tests/getprocaddress.c index 7b6691c8..f7903d2b 100644 --- a/src/tests/getprocaddress.c +++ b/src/tests/getprocaddress.c @@ -27,7 +27,7 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/tests/jkrahntest.c b/src/tests/jkrahntest.c index 186430ac..3fef105f 100644 --- a/src/tests/jkrahntest.c +++ b/src/tests/jkrahntest.c @@ -18,7 +18,7 @@ */ #include <GL/glx.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <string.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/tests/sharedtex.c b/src/tests/sharedtex.c index e0f613fd..2337b88d 100644 --- a/src/tests/sharedtex.c +++ b/src/tests/sharedtex.c @@ -26,7 +26,7 @@ */ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/tests/texobjshare.c b/src/tests/texobjshare.c index 3c130e3f..2b31cb6c 100644 --- a/src/tests/texobjshare.c +++ b/src/tests/texobjshare.c @@ -7,7 +7,7 @@ */ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <assert.h> #include <stdio.h> diff --git a/src/tools/trace/gltrace.py b/src/tools/trace/gltrace.py index 718f3fc4..6e5f06bd 100644 --- a/src/tools/trace/gltrace.py +++ b/src/tools/trace/gltrace.py @@ -83,7 +83,7 @@ class PrintGltrace(glX_proto_common.glx_print_proto): #(gl_XML.gl_print_base): #self.printNoinline() print """ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <dlfcn.h> #include "gltrace_support.h" diff --git a/src/trivial/CMakeLists.txt b/src/trivial/CMakeLists.txt index 7aea9e99..195074a3 100644 --- a/src/trivial/CMakeLists.txt +++ b/src/trivial/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 90028598..a3ea7b49 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} diff --git a/src/vp/CMakeLists.txt b/src/vp/CMakeLists.txt index 34cf2494..5bc49119 100644 --- a/src/vp/CMakeLists.txt +++ b/src/vp/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/vpglsl/CMakeLists.txt b/src/vpglsl/CMakeLists.txt index 0aa9709b..36ee9862 100644 --- a/src/vpglsl/CMakeLists.txt +++ b/src/vpglsl/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ${OPENGL_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( diff --git a/src/xdemos/CMakeLists.txt b/src/xdemos/CMakeLists.txt index 5c457d6f..f60f6823 100644 --- a/src/xdemos/CMakeLists.txt +++ b/src/xdemos/CMakeLists.txt @@ -1,18 +1,17 @@ include_directories ( - ${mesademos_SOURCE_DIR}/src/util - ${OPENGL_INCLUDE_PATH} + ${CMAKE_SOURCE_DIR}/src/util ${X11_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ) link_directories ( - ${mesademos_SOURCE_DIR}/src/util + ${CMAKE_SOURCE_DIR}/src/util ) link_libraries ( util - ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} + ${X11_GL_LIB} + ${X11_GLU_LIB} ${GLEW_glew_LIBRARY} ${X11_X11_LIB} ${X11_Xext_LIB} diff --git a/src/xdemos/corender.c b/src/xdemos/corender.c index bba59999..e706f4b3 100644 --- a/src/xdemos/corender.c +++ b/src/xdemos/corender.c @@ -14,7 +14,7 @@ */ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <assert.h> #include <math.h> diff --git a/src/xdemos/glsync.c b/src/xdemos/glsync.c index 240a7f55..87951f49 100644 --- a/src/xdemos/glsync.c +++ b/src/xdemos/glsync.c @@ -49,7 +49,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <GL/glxext.h> #include <X11/X.h> diff --git a/src/xdemos/glthreads.c b/src/xdemos/glthreads.c index bb3f9fb5..ea547487 100644 --- a/src/xdemos/glthreads.c +++ b/src/xdemos/glthreads.c @@ -48,7 +48,7 @@ #if defined(PTHREADS) /* defined by Mesa on Linux and other platforms */ #include <assert.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <math.h> #include <stdio.h> diff --git a/src/xdemos/glxcontexts.c b/src/xdemos/glxcontexts.c index ae82ad80..9f83679a 100644 --- a/src/xdemos/glxcontexts.c +++ b/src/xdemos/glxcontexts.c @@ -37,7 +37,7 @@ #include <string.h> #include <X11/Xlib.h> #include <X11/keysym.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> diff --git a/src/xdemos/glxdemo.c b/src/xdemos/glxdemo.c index 4427cfab..37df64eb 100644 --- a/src/xdemos/glxdemo.c +++ b/src/xdemos/glxdemo.c @@ -7,7 +7,7 @@ * Brian Paul */ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/xdemos/glxgears.c b/src/xdemos/glxgears.c index a91b337f..92c75caa 100644 --- a/src/xdemos/glxgears.c +++ b/src/xdemos/glxgears.c @@ -33,7 +33,7 @@ #include <string.h> #include <X11/Xlib.h> #include <X11/keysym.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <GL/glxext.h> diff --git a/src/xdemos/glxgears_fbconfig.c b/src/xdemos/glxgears_fbconfig.c index 8412c911..36bf7313 100644 --- a/src/xdemos/glxgears_fbconfig.c +++ b/src/xdemos/glxgears_fbconfig.c @@ -40,7 +40,7 @@ #include <string.h> #include <X11/Xlib.h> #include <X11/keysym.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <GL/glxext.h> #include <assert.h> diff --git a/src/xdemos/glxgears_pixmap.c b/src/xdemos/glxgears_pixmap.c index 90ceea1d..661d130e 100644 --- a/src/xdemos/glxgears_pixmap.c +++ b/src/xdemos/glxgears_pixmap.c @@ -42,7 +42,7 @@ #include <string.h> #include <X11/Xlib.h> #include <X11/keysym.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <GL/glxext.h> #include <assert.h> diff --git a/src/xdemos/glxheads.c b/src/xdemos/glxheads.c index 38a43536..edae0a3e 100644 --- a/src/xdemos/glxheads.c +++ b/src/xdemos/glxheads.c @@ -25,7 +25,7 @@ */ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/xdemos/glxinfo.c b/src/xdemos/glxinfo.c index d112d00f..fe2f68be 100644 --- a/src/xdemos/glxinfo.c +++ b/src/xdemos/glxinfo.c @@ -39,7 +39,7 @@ #include <assert.h> #include <X11/Xlib.h> #include <X11/Xutil.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <stdio.h> #include <string.h> diff --git a/src/xdemos/glxpixmap.c b/src/xdemos/glxpixmap.c index 043da37c..58ad6004 100644 --- a/src/xdemos/glxpixmap.c +++ b/src/xdemos/glxpixmap.c @@ -8,7 +8,7 @@ */ -#include "gl_wrap.h" +#include <GL/gl.h> #define GLX_GLXEXT_PROTOTYPES #include <GL/glx.h> #include <stdio.h> diff --git a/src/xdemos/glxsnoop.c b/src/xdemos/glxsnoop.c index f9631211..2e951345 100644 --- a/src/xdemos/glxsnoop.c +++ b/src/xdemos/glxsnoop.c @@ -10,7 +10,7 @@ #define GL_GLEXT_PROTOTYPES -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/xdemos/glxswapcontrol.c b/src/xdemos/glxswapcontrol.c index 4c42a0e9..7c4b413b 100644 --- a/src/xdemos/glxswapcontrol.c +++ b/src/xdemos/glxswapcontrol.c @@ -45,7 +45,7 @@ /*# include <stdint.h>*/ #endif # define GLX_GLXEXT_PROTOTYPES -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #ifndef GLX_MESA_swap_control diff --git a/src/xdemos/manywin.c b/src/xdemos/manywin.c index 3dfbb6ce..8ad5c4fe 100644 --- a/src/xdemos/manywin.c +++ b/src/xdemos/manywin.c @@ -24,7 +24,7 @@ */ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <assert.h> #include <stdio.h> diff --git a/src/xdemos/msctest.c b/src/xdemos/msctest.c index 69c7f7a1..662814f9 100644 --- a/src/xdemos/msctest.c +++ b/src/xdemos/msctest.c @@ -32,7 +32,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <GL/glxext.h> #include <X11/X.h> diff --git a/src/xdemos/multictx.c b/src/xdemos/multictx.c index ebcbdfad..75255b28 100644 --- a/src/xdemos/multictx.c +++ b/src/xdemos/multictx.c @@ -37,7 +37,7 @@ #include <unistd.h> #include <X11/Xlib.h> #include <X11/keysym.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> diff --git a/src/xdemos/omlsync.c b/src/xdemos/omlsync.c index c4c570b5..03780f73 100644 --- a/src/xdemos/omlsync.c +++ b/src/xdemos/omlsync.c @@ -49,7 +49,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <GL/glxext.h> #include <X11/X.h> diff --git a/src/xdemos/opencloseopen.c b/src/xdemos/opencloseopen.c index 6860f3e7..75609609 100644 --- a/src/xdemos/opencloseopen.c +++ b/src/xdemos/opencloseopen.c @@ -25,7 +25,7 @@ #include <unistd.h> #include <string.h> #include <X11/Xlib.h> -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> /** \file opencloseopen.c diff --git a/src/xdemos/overlay.c b/src/xdemos/overlay.c index 31335946..758f85c4 100644 --- a/src/xdemos/overlay.c +++ b/src/xdemos/overlay.c @@ -5,7 +5,7 @@ * 18 July 2005 */ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <X11/keysym.h> #include <assert.h> diff --git a/src/xdemos/sharedtex.c b/src/xdemos/sharedtex.c index 90121182..81703fe0 100644 --- a/src/xdemos/sharedtex.c +++ b/src/xdemos/sharedtex.c @@ -27,7 +27,7 @@ */ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <assert.h> #include <stdio.h> diff --git a/src/xdemos/sharedtex_mt.c b/src/xdemos/sharedtex_mt.c index b7c8a8fb..a90903ad 100644 --- a/src/xdemos/sharedtex_mt.c +++ b/src/xdemos/sharedtex_mt.c @@ -30,7 +30,7 @@ */ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/xdemos/texture_from_pixmap.c b/src/xdemos/texture_from_pixmap.c index 118fcdbf..5f2fbc3f 100644 --- a/src/xdemos/texture_from_pixmap.c +++ b/src/xdemos/texture_from_pixmap.c @@ -32,7 +32,7 @@ #define GL_GLEXT_PROTOTYPES #define GLX_GLXEXT_PROTOTYPES -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <X11/keysym.h> #include <stdio.h> diff --git a/src/xdemos/wincopy.c b/src/xdemos/wincopy.c index efdaeaa7..f670983a 100644 --- a/src/xdemos/wincopy.c +++ b/src/xdemos/wincopy.c @@ -34,7 +34,7 @@ #define GL_GLEXT_PROTOTYPES #define GLX_GLXEXT_PROTOTYPES -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <X11/keysym.h> #include <stdio.h> diff --git a/src/xdemos/xfont.c b/src/xdemos/xfont.c index e5284ed9..2585aa64 100644 --- a/src/xdemos/xfont.c +++ b/src/xdemos/xfont.c @@ -30,7 +30,7 @@ */ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/xdemos/xrotfontdemo.c b/src/xdemos/xrotfontdemo.c index f1b9015f..58cd0286 100644 --- a/src/xdemos/xrotfontdemo.c +++ b/src/xdemos/xrotfontdemo.c @@ -29,7 +29,7 @@ */ -#include "gl_wrap.h" +#include <GL/gl.h> #include <GL/glx.h> #include <stdio.h> #include <stdlib.h> |