X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6a6b7443290f1e457f9e84257549b9f42da70ce..bd018e7e31361bc2112a386f18663908a0559d58:/build/bakefiles/opengl.bkl?ds=sidebyside

diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl
index 56ed96378a..d3bc51c5be 100644
--- a/build/bakefiles/opengl.bkl
+++ b/build/bakefiles/opengl.bkl
@@ -19,28 +19,23 @@
         <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>
 
 </makefile>