small reorganization; no real change

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

diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl
index 79dc56c13ad846d06f0ab4645b8cc47da145405f..e258b812ec7aa9b6c5c916932c1dbf27617badc3 100644 (file)
--- a/build/bakefiles/opengl.bkl
+++ b/build/bakefiles/opengl.bkl
@@ -28,17 +28,9 @@
         <depends>coredll</depends>
         <!-- link against the wxWin library in monolithic build: -->
         <sys-lib>$(WXLIB_MONO)</sys-lib>
         <depends>coredll</depends>
         <!-- link against the wxWin library in monolithic build: -->
         <sys-lib>$(WXLIB_MONO)</sys-lib>

+        <depends>monodll</depends>

 
 

-        <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"
     </dll>
     
     <lib id="gllib" template="wx_lib"


@@ -47,4 +39,6 @@
         <msvc-headers>$(OPENGL_HDR)</msvc-headers>
     </lib>
 
         <msvc-headers>$(OPENGL_HDR)</msvc-headers>
     </lib>
 

+    <wxshortcut id="wxgl" cond="USE_GUI=='1' and USE_OPENGL=='1'"/>
+

 </makefile>
 </makefile>