[Wxlua-commit] wxLua/build/bakefiles/presets wx_win32.bkl,1.2,1.3

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/build/bakefiles/presets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27081/wxLua/build/bakefiles/presets

Modified Files:
	wx_win32.bkl 
Log Message:
The wxWidgets GL library is not part of the monolithic build, treat it
as a contrib.


Index: wx_win32.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/presets/wx_win32.bkl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wx_win32.bkl	4 May 2007 20:22:25 -0000	1.2
--- wx_win32.bkl	16 Jan 2008 16:46:11 -0000	1.3
***************
*** 149,158 ****
      <define-wxlib-name>qa</define-wxlib-name>
      <define-wxlib-name>dbgrid</define-wxlib-name>
-     <define-wxlib-name>gl</define-wxlib-name>
      <define-wxlib-name>aui</define-wxlib-name>
      <define-wxlib-name>richtext</define-wxlib-name>
  
! 
! 
  
  
--- 149,158 ----
      <define-wxlib-name>qa</define-wxlib-name>
      <define-wxlib-name>dbgrid</define-wxlib-name>
      <define-wxlib-name>aui</define-wxlib-name>
      <define-wxlib-name>richtext</define-wxlib-name>
  
!     <!-- The GL lib is not part of the monolithic build in 2.8, treat it as a contrib
!         <define-wxlib-name>gl</define-wxlib-name>
!     -->
  
  
***************
*** 188,192 ****
          <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=='dbgrid'"><sys-lib>$(WXLIB_DBGRID_NAME)</sys-lib></if>
          <if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
--- 188,191 ----
***************
*** 194,197 ****
--- 193,201 ----
          <if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
  
+         <!-- The GL lib isn't part of the monolithic build in 2.8, treat it as a contrib -->
+         <if cond="value=='gl'">
+             <sys-lib>wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
+         </if>
+ 
          <!-- wx-lib can be used also to link against contrib libraries
               (which always have the same name, regardless of WX_MONOLITHIC value) -->