From b8524670d9b3ddcbba7e77b92ae5a48a9e4bc65e Mon Sep 17 00:00:00 2001
From: Francesco Montorsi <f18m_cpp217828@yahoo.it>
Date: Sun, 20 Jan 2008 12:34:30 +0000
Subject: [PATCH] Gl library is not part of the monolithic library even when
 MONOLITHIC=1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/wxpresets/presets/wx_win32.bkl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index dfb564ca84..519549511f 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -146,12 +146,11 @@
     <define-wxlib-name>html</define-wxlib-name>
     <define-wxlib-name>adv</define-wxlib-name>
     <define-wxlib-name>qa</define-wxlib-name>
-    <define-wxlib-name>gl</define-wxlib-name>
     <define-wxlib-name>aui</define-wxlib-name>
     <define-wxlib-name>stc</define-wxlib-name>
     <define-wxlib-name>richtext</define-wxlib-name>
 
-
+    <!-- NOTE: The GL lib is not part of the monolithic build; treat it as a contrib! -->
 
 
 
@@ -185,11 +184,15 @@
         <if cond="value=='xrc'"><sys-lib>$(WXLIB_XRC_NAME)</sys-lib></if>
         <if cond="value=='html'"><sys-lib>$(WXLIB_HTML_NAME)</sys-lib></if>
         <if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if>
-        <if cond="value=='gl'"><sys-lib>$(WXLIB_GL_NAME)</sys-lib></if>
         <if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
         <if cond="value=='aui'"><sys-lib>$(WXLIB_AUI_NAME)</sys-lib></if>
         <if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
 
+        <!-- The GL lib isn't part of the monolithic build, treat it as a contrib: -->
+        <if cond="value=='gl'">
+            <sys-lib>wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
+        </if>
+
         <if cond="value=='stc'">
             <!-- wxSTC requires also the basic scintilla library
                  which is built as a separate 3rd party library -->
-- 
2.45.2