Don't crash if no scrollbar

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index b6f2281ac183b7076f025b36779ba1b31574f8be..1618f74ee9773b74046fc2e7180dcdb9acd0af59 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -145,6 +145,9 @@
     <set var="WXLIB_AUI">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
     </set>
     <set var="WXLIB_AUI">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
     </set>

+    <set var="WXLIB_PROPGRID">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('propgrid')))</if>
+    </set>

     <set var="WXLIB_RICHTEXT">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
     </set>
     <set var="WXLIB_RICHTEXT">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
     </set>


@@ -543,6 +546,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
                 <sys-lib>rpcrt4</sys-lib>
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>
                 <sys-lib>rpcrt4</sys-lib>
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>

+                <!-- this one is only used if wxUSE_URL_NATIVE==1 but we don't
+                     know if it is here so just add it unconditionally -->
+                <sys-lib>wininet</sys-lib>

             </if>
             <if cond="FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>
             <if cond="FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>