X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfcf1d6ee31a87a20b1e6f198612be41b2bfecfa..2e59a53a5973d8da4155eb8481ac29e82d7e152f:/build/bakefiles/multilib.bkl

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 6c5ffd7c7f..545ca64ce7 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -174,34 +174,28 @@
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
 
     <!-- ================================================================ -->
-    <!--                               wxWEB                              -->
+    <!--                               wxWEBVIEW                          -->
     <!-- ================================================================ -->
 
-    <dll id="webdll" template="wx_dll"
-         cond="SHARED=='1' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'">
+    <dll id="webviewdll" template="wx_dll"
+         cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_WEB</define>
-        <sources>$(WEB_SRC)</sources>
+        <define>WXMAKINGDLL_WEBVIEW</define>
+        <sources>$(WEBVIEW_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>
-        <ldlibs>$(EXTRALIBS_WEB)</ldlibs>
-        <msvc-headers>$(WEB_HDR)</msvc-headers>
+        <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
     </dll>
 
-    <!-- use this to conditonally link against htmldll with <library>: -->
-    <set var="webdll_library_link">
-        <if cond="SHARED=='1' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'">webdll</if>
-    </set>
-
-    <lib id="weblib" template="wx_lib"
-         cond="SHARED=='0' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'">
-        <sources>$(WEB_SRC)</sources>
-        <msvc-headers>$(WEB_HDR)</msvc-headers>
+    <lib id="webviewlib" template="wx_lib"
+         cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
+        <sources>$(WEBVIEW_SRC)</sources>
+        <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxweb" cond="MONOLITHIC=='0' and USE_WEB=='1'"/>
+    <wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>
 
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">web=weblib+webdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webview=webviewlib+webviewdll</set>
 
     <!-- ================================================================ -->
     <!--                             OpenGL                               -->