Merge OpenGL API changes and better modern OpenGL support

Closes https://github.com/wxWidgets/wxWidgets/pull/227
2016-02-24 20:15:35 +01:00
parent a216806c99 d6fb44e158
commit 1c9a4694ff
44 changed files with 9382 additions and 1157 deletions
--- a/3
+++ b/3
@@ -27611,7 +27611,7 @@ $as_echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library wil

        $as_echo "#define wxUSE_GLCANVAS 1" >>confdefs.h

-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf opengl/pyramid"
    fi
 fi

@@ -40907,4 +40907,3 @@ echo "                                       libmspack          ${wxUSE_LIBMSPAC
 echo "                                       sdl                ${wxUSE_LIBSDL}"

 echo ""
-