From: Václav Slavík <vslavik@fastmail.fm>
Date: Thu, 22 Apr 2004 08:26:14 +0000 (+0000)
Subject: fixed generating dmars makefiles
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3a8110962140d874ea1ff2a4010276b17837d763

fixed generating dmars makefiles


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 774c2612a6..77f2e66b5e 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -433,7 +433,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             </precomp-headers-exclude>
         </if>
         
-        <if cond="IS_MSVC_PRJ and BUILDING_LIB=='1'">
+        <if cond="IS_MSVC_PRJ=='1' and BUILDING_LIB=='1'">
             <msvc-file-group>Common Sources:src/common/*</msvc-file-group>
             <msvc-file-group>MSW Sources:src/msw/*</msvc-file-group>
             <msvc-file-group>Generic Sources:src/generic/*</msvc-file-group>
@@ -562,7 +562,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
     <define-tag name="wx-lib" rules="exe,dll,module">
         <sys-lib>$(wxwin.libToLink(value))</sys-lib>
         <ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
-        <if cond="IS_MSVC_PRJ and MONOLITHIC=='0'">
+        <if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
             <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
         </if>
     </define-tag>