X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdcc580c3d4c62277b01b0b6089c49610c4f2aee..a63d2334f286875839c2a8324875a0f4d117e224:/build/bakefiles/wx.bkl?ds=sidebyside

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 3a0e66982c..0907ece4a7 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -23,6 +23,14 @@
     <include file="monolithic.bkl"/>
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
+
+    <if cond="FORMAT in ['msvc6prj','msevc4prj']">
+        <set var="MSVC6PRJ_MERGED_TARGETS">
+            <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
+            <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
+        </set>
+    </if>
+    
     <!-- OpenGL canvas is built as separate library in both cases: -->
     <include file="opengl.bkl"/>
     <!-- Dynamically loadable plugins: -->