X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/957130ca06de42ad8302f465b3af52feb3d42f85..2d6c4e485c7fef1c4da20a380423615e8fe19b81:/build/bakefiles/opengl.bkl

diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl
index 6ecbe8321f..2d5353c637 100644
--- a/build/bakefiles/opengl.bkl
+++ b/build/bakefiles/opengl.bkl
@@ -7,22 +7,42 @@
     <!--                         OpenGL canvas library                     -->
     <!-- ================================================================= -->
     
+    <set var="WXLIBGLDEP_CORE">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
+    </set>
+    <set var="WXLIBGLDEP_BASE">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
+    </set>
+    
     <dll id="gldll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and USE_OPENGL=='1'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_GL</define>
         <sources>$(OPENGL_SRC)</sources>
-        <library>coredll</library>
-        <library>basedll</library>
+        <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>
+        <!-- link against the wxWin library in monolithic build: -->
+        <sys-lib>$(WXLIB_MONO)</sys-lib>
 
         <if cond="FORMAT=='autoconf'">
-            <ldflags>$(OPENGL_LIBS)</ldflags>
+            <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>        
     </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>