[ 1176516 ] argv datatype has changed (char in docs but really wxChar)

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

diff --git a/contrib/build/stc/stc.bkl b/contrib/build/stc/stc.bkl
index 2ce95a44410c3cffb45f96fa7334b6f73cf8b2fb..0e1fe5abbed56d276780d608530a88f93448205e 100644 (file)
--- a/contrib/build/stc/stc.bkl
+++ b/contrib/build/stc/stc.bkl
@@ -16,8 +16,8 @@
         scintilla/src/CallTip.cxx
         scintilla/src/CellBuffer.cxx
         scintilla/src/ContractionState.cxx
         scintilla/src/CallTip.cxx
         scintilla/src/CellBuffer.cxx
         scintilla/src/ContractionState.cxx

-        scintilla/src/DocumentAccessor.cxx

         scintilla/src/Document.cxx
         scintilla/src/Document.cxx

+        scintilla/src/DocumentAccessor.cxx

         scintilla/src/Editor.cxx
         scintilla/src/ExternalLexer.cxx
         scintilla/src/Indicator.cxx
         scintilla/src/Editor.cxx
         scintilla/src/ExternalLexer.cxx
         scintilla/src/Indicator.cxx


@@ -28,6 +28,7 @@
         scintilla/src/LexAVE.cxx
         scintilla/src/LexAda.cxx
         scintilla/src/LexAsm.cxx
         scintilla/src/LexAVE.cxx
         scintilla/src/LexAda.cxx
         scintilla/src/LexAsm.cxx

+        scintilla/src/LexAsn1.cxx

         scintilla/src/LexBaan.cxx
         scintilla/src/LexBash.cxx
         scintilla/src/LexBullant.cxx
         scintilla/src/LexBaan.cxx
         scintilla/src/LexBash.cxx
         scintilla/src/LexBullant.cxx


@@ -66,14 +67,15 @@
         scintilla/src/LexSpecman.cxx
         scintilla/src/LexTeX.cxx
         scintilla/src/LexVB.cxx
         scintilla/src/LexSpecman.cxx
         scintilla/src/LexTeX.cxx
         scintilla/src/LexVB.cxx

+        scintilla/src/LexVHDL.cxx

         scintilla/src/LexVerilog.cxx
         scintilla/src/LexYAML.cxx
         scintilla/src/LineMarker.cxx
         scintilla/src/PropSet.cxx
         scintilla/src/RESearch.cxx
         scintilla/src/ScintillaBase.cxx
         scintilla/src/LexVerilog.cxx
         scintilla/src/LexYAML.cxx
         scintilla/src/LineMarker.cxx
         scintilla/src/PropSet.cxx
         scintilla/src/RESearch.cxx
         scintilla/src/ScintillaBase.cxx

-        scintilla/src/StyleContext.cxx

         scintilla/src/Style.cxx
         scintilla/src/Style.cxx

+        scintilla/src/StyleContext.cxx

         scintilla/src/UniConversion.cxx
         scintilla/src/ViewStyle.cxx
         scintilla/src/WindowAccessor.cxx
         scintilla/src/UniConversion.cxx
         scintilla/src/ViewStyle.cxx
         scintilla/src/WindowAccessor.cxx


@@ -93,6 +95,7 @@
         <define>SCI_LEXER</define>
         <define>LINK_LEXERS</define>
         <sources>$(STC_SRC)</sources>
         <define>SCI_LEXER</define>
         <define>LINK_LEXERS</define>
         <sources>$(STC_SRC)</sources>

+        <cppflags-borland>-w-8027</cppflags-borland>

     </template>
 
     <dll id="stcdll" template="wx_contrib_dll,stc_base" cond="SHARED=='1'">
     </template>
 
     <dll id="stcdll" template="wx_contrib_dll,stc_base" cond="SHARED=='1'">


@@ -103,7 +106,7 @@
     </dll>
 
     <lib id="stclib" template="wx_contrib_lib,stc_base" cond="SHARED=='0'"/>
     </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>
     <set var="MSVC6PRJ_MERGED_TARGETS" append="1">stc=stclib+stcdll</set>
 
 </makefile>