add GetLo/Hi() test

[wxWidgets.git] / build / bakefiles / opengl.bkl

diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl
index 56ed96378a2157e11ddad8426f975c9368edb7c7..38950a92cd92971e7c3a3b49ca2fbb3fe0e17bf8 100644 (file)
--- a/build/bakefiles/opengl.bkl
+++ b/build/bakefiles/opengl.bkl
@@ -19,28 +19,25 @@
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_GL</define>
         <sources>$(OPENGL_SRC)</sources>
+        <msvc-headers>$(OPENGL_HDR)</msvc-headers>
 
         <!-- link against base and core libs in multilib build: --> 
         <sys-lib>$(WXLIBGLDEP_CORE)</sys-lib>
         <sys-lib>$(WXLIBGLDEP_BASE)</sys-lib>
+        <depends>basedll</depends>
+        <depends>coredll</depends>
         <!-- link against the wxWin library in monolithic build: -->
         <sys-lib>$(WXLIB_MONO)</sys-lib>
 
-        <if cond="FORMAT=='autoconf'">
-            <ldflags>$(EXTRALIBS_OPENGL)</ldflags>
-        </if>
-        <!-- system libraries on windows: -->
-        <if cond="FORMAT!='autoconf'">
-            <if cond="COMPILER=='wat' or COMPILER=='gcc'">
-                <sys-lib>opengl32</sys-lib>
-                <sys-lib>glu32</sys-lib>
-            </if>
-        </if>        
+        <ldlibs>$(EXTRALIBS_OPENGL)</ldlibs>
     </dll>
     
     <lib id="gllib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and USE_OPENGL=='1'">
         <sources>$(OPENGL_SRC)</sources>
+        <msvc-headers>$(OPENGL_HDR)</msvc-headers>
     </lib>
 
+    <wxshortcut id="wxgl" cond="USE_GUI=='1' and USE_OPENGL=='1'"/>
+
 </makefile>