Add generic dialogs in non wxUniversal builds. Regenerated makefiles.

[wxWidgets.git] / contrib / build / stc / stc.bkl

diff --git a/contrib/build/stc/stc.bkl b/contrib/build/stc/stc.bkl
index 45b1fb75dd909be43827348a100117b75847c820..7dd9548deec93c58a38b8fc9cf63f7d7de703a68 100644 (file)
--- a/contrib/build/stc/stc.bkl
+++ b/contrib/build/stc/stc.bkl
@@ -3,6 +3,7 @@
 
 <makefile>
 
+    <set var="WX_DISABLE_PRECOMP_HEADERS">1</set>
     <include file="../../../build/bakefiles/common_contrib.bkl"/>
 
     <set var="STC_SRC">
@@ -15,45 +16,60 @@
         scintilla/src/CallTip.cxx
         scintilla/src/CellBuffer.cxx
         scintilla/src/ContractionState.cxx
-        scintilla/src/Document.cxx
         scintilla/src/DocumentAccessor.cxx
+        scintilla/src/Document.cxx
         scintilla/src/Editor.cxx
+        scintilla/src/ExternalLexer.cxx
         scintilla/src/Indicator.cxx
         scintilla/src/KeyMap.cxx
         scintilla/src/KeyWords.cxx
-        scintilla/src/LexAVE.cxx
         scintilla/src/LexAda.cxx
         scintilla/src/LexAsm.cxx
+        scintilla/src/LexAVE.cxx
         scintilla/src/LexBaan.cxx
         scintilla/src/LexBullant.cxx
-        scintilla/src/LexCPP.cxx
-        scintilla/src/LexCSS.cxx
+        scintilla/src/LexCLW.cxx
         scintilla/src/LexConf.cxx
+        scintilla/src/LexCPP.cxx
         scintilla/src/LexCrontab.cxx
+        scintilla/src/LexCSS.cxx
         scintilla/src/LexEiffel.cxx
+        scintilla/src/LexErlang.cxx
+        scintilla/src/LexEScript.cxx
+        scintilla/src/LexForth.cxx
         scintilla/src/LexFortran.cxx
         scintilla/src/LexHTML.cxx
         scintilla/src/LexLisp.cxx
+        scintilla/src/LexLout.cxx
         scintilla/src/LexLua.cxx
         scintilla/src/LexMatlab.cxx
+        scintilla/src/LexMetapost.cxx
+        scintilla/src/LexMMIXAL.cxx
+        scintilla/src/LexMPT.cxx
+        scintilla/src/LexNsis.cxx
         scintilla/src/LexOthers.cxx
-        scintilla/src/LexPOV.cxx
         scintilla/src/LexPascal.cxx
+        scintilla/src/LexPB.cxx
         scintilla/src/LexPerl.cxx
+        scintilla/src/LexPOV.cxx
+        scintilla/src/LexPS.cxx
         scintilla/src/LexPython.cxx
         scintilla/src/LexRuby.cxx
+        scintilla/src/LexScriptol.cxx
         scintilla/src/LexSQL.cxx
+        scintilla/src/LexTeX.cxx
         scintilla/src/LexVB.cxx
+        scintilla/src/LexYAML.cxx
         scintilla/src/LineMarker.cxx
         scintilla/src/PropSet.cxx
         scintilla/src/RESearch.cxx
         scintilla/src/ScintillaBase.cxx
-        scintilla/src/Style.cxx
         scintilla/src/StyleContext.cxx
+        scintilla/src/Style.cxx
         scintilla/src/UniConversion.cxx
         scintilla/src/ViewStyle.cxx
         scintilla/src/WindowAccessor.cxx
-        scintilla/src/XPM.cxx 
+        scintilla/src/XPM.cxx
     </set>
 
     <headers template="wx_contrib_headers">
@@ -77,7 +93,9 @@
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
     </dll>
-    
+
     <lib id="stclib" template="wx_contrib_lib,stc_base" cond="SHARED=='0'"/>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">stc=stclib+stcdll</set>
 
 </makefile>