Really fix wxUSE_PREFERENCES_EDITOR requirements check.

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 242693e8d8b7ee459af488e3a32698e4e3e3a0ee..96fbcdf3faacdf09af5bcfb2e459ad5ff83324ba 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -436,21 +436,10 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
                 </set>
             </if>
             <if cond="FORMAT!='msevc4prj'">
-                <!-- Unfortunately we have to include wx/univ/setup.h in both
-                     cases because WXUNIV==1 is not a weak condition, but at
-                     least don't include wxGTK setup.h when building wxMSW. -->
-                <if cond="TOOLKIT=='MSW'">
-                    <msvc-headers-setup-h>
-                        msw/setup.h
-                        univ/setup.h
-                    </msvc-headers-setup-h>
-                </if>
-                <if cond="TOOLKIT=='GTK'">
-                    <msvc-headers-setup-h>
-                        gtk/setup.h
-                        univ/setup.h
-                    </msvc-headers-setup-h>
-                </if>
+                <msvc-headers-setup-h>
+                    msw/setup.h
+                    univ/setup.h
+                </msvc-headers-setup-h>
                 <set var="_custom_build_include_wx_msw_setup_h">
                     <if cond="WXUNIV=='0' and TOOLKIT=='MSW'">
                         $(msvc_copy_setup_h_script % 'msw\setup.h')
@@ -636,7 +625,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     </set>
 
     <set var="LIB_SCINTILLA_IF_MONO">
-        <if cond="MONOLITHIC=='1'">$(LIB_SCINTILLA)</if>
+        <if cond="MONOLITHIC=='1' and USE_STC=='1'">$(LIB_SCINTILLA)</if>
     </set>
 
     <template id="wx_append_base" template_append="wx_append_base_nomono">