X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c79241a238663d524ba4b9b63bcf9952f3d58609..de20cd5f3b8675f5d2f43ad14a6c2dd6c27b5c94:/build/bakefiles/multilib.bkl

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 2c2688e145..0d5a8b962a 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -22,7 +22,7 @@
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
     </lib>
 
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">base=baselib+basedll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
     
     
     <!-- ================================================================= -->
@@ -44,7 +44,7 @@
         <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">net=netlib+netdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
 
     
     <!-- ================================================================= -->
@@ -68,7 +68,7 @@
         <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">core=corelib+coredll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
     
     
     <!-- ================================================================= -->
@@ -92,7 +92,7 @@
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">adv=advlib+advdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
     
     
     <!-- ================================================================= -->
@@ -134,8 +134,8 @@
         <msvc-headers>$(DBGRID_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">odbc=odbclib+odbcdll</set>
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">dbgrid=dbgridlib+dbgriddll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
 
     
     <!-- ================================================================ -->
@@ -159,7 +159,7 @@
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">html=htmllib+htmldll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
     
     <!-- ================================================================ -->
     <!--                             OpenGL                               -->
@@ -167,7 +167,7 @@
 
     <!-- included by wx.bkl from opengl.bkl -->
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gl=gllib+gldll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">gl=gllib+gldll</set>
     
     
     <!-- ================================================================ -->
@@ -190,6 +190,6 @@
         <msvc-headers>$(XML_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">xml=xmllib+xmldll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
     
 </makefile>