cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'opengl-update-info' of https://github.com/PBfordev/wxWidgets

Browse Source 
Minor updates to OpenGK-related documentation and comments.

See https://github.com/wxWidgets/wxWidgets/pull/2360
This commit is contained in:
Vadim Zeitlin 2021-05-09 00:28:16 +02:00
commit 4b71e50094
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
interface/wx/glcanvas.h
View File

@ -772,11 +772,10 @@ enum
On those platforms which use a configure script (e.g. Linux and macOS)
OpenGL support is automatically enabled if the relative headers and
libraries are found.
To switch it on under the other platforms (e.g. Windows), you need to edit
the @c setup.h file and set @c wxUSE_GLCANVAS to @c 1 and then also pass
@c USE_OPENGL=1 to the make utility. You may also need to add @c opengl32.lib
(and @c glu32.lib for old OpenGL versions) to the list of the libraries
your program is linked with.
On Windows, OpenGL support is enabled by default (@c wxUSE_GLCANVAS set
to @c 1 in the @c setup.h file). If your program links with wxWidgets
statically, you need to add @c opengl32.lib (and @c glu32.lib for old
OpenGL versions) to the list of the libraries your program is linked with.
@library{wxgl}
@category{gl}

19
src/msw/glcanvas.cpp
View File

@ -167,23 +167,8 @@ inline T wxWGLProcCast(PROC proc)
// libraries
// ----------------------------------------------------------------------------
/*
The following two compiler directives are specific to the Microsoft Visual
C++ family of compilers
Fundementally what they do is instruct the linker to use these two libraries
for the resolution of symbols. In essence, this is the equivalent of adding
these two libraries to either the Makefile or project file.
This is NOT a recommended technique, and certainly is unlikely to be used
anywhere else in wxWidgets given it is so specific to not only wxMSW, but
also the VC compiler. However, in the case of opengl support, it's an
applicable technique as opengl is optional in setup.h This code (wrapped by
wxUSE_GLCANVAS), now allows opengl support to be added purely by modifying
setup.h rather than by having to modify either the project or DSP fle.
See MSDN for further information on the exact usage of these commands.
*/
// For MSVC we can link in the required library explicitly, for the other
// compilers (e.g. MinGW) this needs to be done at makefiles level.
#ifdef _MSC_VER
# pragma comment( lib, "opengl32" )
# pragma comment( lib, "glu32" )