cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
951b385ad8
wxWidgets/build/bakefiles/scintilla.bkl

187 lines
8.2 KiB
Plaintext
Raw Normal View History

Bakefile and other changes for new locations of STC and wxSVGFileDC. Remove old files in contrib. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 02:27:23 -04:00
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<set var="LIB_SCINTILLA">
wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="LIB_SCINTILLA">
wxscintilla$(WXDEBUGFLAG)$(HOST_SUFFIX)
</set>
</if>
<set var="INC_SCINTILLA">
$(TOP_SRCDIR)src/stc/scintilla/include
</set>
don't update stc.h when not building the library, it doesn't make sense to do this in the samples makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-12 05:13:36 -04:00
<!-- automatically update generated files when building the library -->
<if cond="BUILDING_LIB=='1'">
<fragment format='autoconf'>
check for Python and disable automatic STC files updating which requires it if it's not available git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-08 19:12:57 -04:00
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
@COND_PYTHON@@COND_USE_STC_1@ cd $(srcdir)/src/stc &amp;&amp; ./gen_iface.py
@COND_PYTHON@@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
@COND_PYTHON@@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h
don't update stc.h when not building the library, it doesn't make sense to do this in the samples makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-12 05:13:36 -04:00
</fragment>
</if>
rebuild files generated by src/stc/gen_iface.py automatically in Unix builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-14 19:29:45 -04:00
No real changes in makefile but avoid repetitious in bakefile. Collect all preprocessor options needed for Scintilla compilation in wxscintilla_cppflags template and use for both Scintilla compilation itself and for the wx libraries using it. The order of flags in the makefiles has changed but they are still the same except for Borland makefile which now includes Borland-specific warning suppression option everywhere it's needed and not just in multilib targets. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 20:18:57 -04:00
<template id="wxscintilla_cppflags">
Bakefile and other changes for new locations of STC and wxSVGFileDC. Remove old files in contrib. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 02:27:23 -04:00
<include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
rebake make/project files for new scintilla git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-14 01:14:27 -04:00
<include>$(TOP_SRCDIR)src/stc/scintilla/lexlib</include>
Bakefile and other changes for new locations of STC and wxSVGFileDC. Remove old files in contrib. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 02:27:23 -04:00
<include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
No real changes in makefile but avoid repetitious in bakefile. Collect all preprocessor options needed for Scintilla compilation in wxscintilla_cppflags template and use for both Scintilla compilation itself and for the wx libraries using it. The order of flags in the makefiles has changed but they are still the same except for Borland makefile which now includes Borland-specific warning suppression option everywhere it's needed and not just in multilib targets. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 20:18:57 -04:00
<define>__WX__</define>
<define>SCI_LEXER</define>
<define>LINK_LEXERS</define>
<cppflags-borland>-w-8027</cppflags-borland>
</template>
Only define WXUSINGDLL in DLL configurations when building wxscintilla. WXUSINGDLL shouldn't be defined in static build configurations, this results in warnings and might explain errors in MinGW build. Closes #11966. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 20:19:06 -04:00
<set var="wxscintilla_usingdll">
Revert "Always define WXUSINGDLL when compiling Scintilla in shared wx build." Finally it's unnecessary to define WXUSINGDLL when building wxScintilla library as it doesn't use the main DLL, it is simply used as part of it. This reverts r66222 and finally closes #12626. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 07:49:25 -05:00
<if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
Only define WXUSINGDLL in DLL configurations when building wxscintilla. WXUSINGDLL shouldn't be defined in static build configurations, this results in warnings and might explain errors in MinGW build. Closes #11966. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 20:19:06 -04:00
</set>
Create setup.h when building wxscintilla library. This library includes some wx headers and so setup.h must be available when it's being compiled but there was no rule to copy it in its projects, so add it now. Closes #13526. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-30 11:26:31 -04:00
<lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags,msvc_setup_h"
No real changes in makefile but avoid repetitious in bakefile. Collect all preprocessor options needed for Scintilla compilation in wxscintilla_cppflags template and use for both Scintilla compilation itself and for the wx libraries using it. The order of flags in the makefiles has changed but they are still the same except for Borland makefile which now includes Borland-specific warning suppression option everywhere it's needed and not just in multilib targets. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 20:18:57 -04:00
cond="USE_STC=='1' and BUILDING_LIB=='1'">
No changes, just remove hard TABs and fix a typo. Separate trivial changes from subsequent commits. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 20:18:51 -04:00
<if cond="FORMAT!='autoconf'">
<include>$(SETUPHDIR)</include>
<include>$(TOP_SRCDIR)include</include>
</if>
Only define WXUSINGDLL in DLL configurations when building wxscintilla. WXUSINGDLL shouldn't be defined in static build configurations, this results in warnings and might explain errors in MinGW build. Closes #11966. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 20:19:06 -04:00
<define>$(wxscintilla_usingdll)</define>
No changes, just remove hard TABs and fix a typo. Separate trivial changes from subsequent commits. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 20:18:51 -04:00
<define>__WX$(TOOLKIT)__</define>
Fixed wxscintilla compilation for wxDFB. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-03 15:33:11 -04:00
<define>$(WXUNIV_DEFINE)</define>
Use correct wxDEBUG_LEVEL value when building wxscintilla library. wxScintilla code uses wxVector<> which brings in wxDEBUG_LEVEL-dependent code so we must use the wxDEBUG_LEVEL value consistent with the rest of the library when building it. Simply pass wxDEBUG_LEVEL definition on the compiler command line if it's different from the default. Closes #12626. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-21 20:22:17 -05:00
<define>$(DEBUG_DEFINE)</define>
Use correct Unicode define for wxScintilla compilation. Compilation of wxScintilla with Borland failed because -D_UNICODE was not passed on command line resulting in mismatches between wxChar and Windows TCHAR. It's a mystery why this didn't happen with the other compilers but defining _UNICODE for them too can't hurt. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-07 17:37:22 -04:00
<define>$(UNICODE_DEFINE)</define>
Bakefile and other changes for new locations of STC and wxSVGFileDC. Remove old files in contrib. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 02:27:23 -04:00
<dirname>$(LIBDIRNAME)</dirname>
<sources>
rebake make/project files for new scintilla git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-14 01:14:27 -04:00
src/stc/scintilla/lexers/LexA68k.cxx
src/stc/scintilla/lexers/LexAbaqus.cxx
src/stc/scintilla/lexers/LexAda.cxx
src/stc/scintilla/lexers/LexAPDL.cxx
src/stc/scintilla/lexers/LexAsm.cxx
src/stc/scintilla/lexers/LexAsn1.cxx
src/stc/scintilla/lexers/LexASY.cxx
src/stc/scintilla/lexers/LexAU3.cxx
src/stc/scintilla/lexers/LexAVE.cxx
src/stc/scintilla/lexers/LexAVS.cxx
src/stc/scintilla/lexers/LexBaan.cxx
src/stc/scintilla/lexers/LexBash.cxx
src/stc/scintilla/lexers/LexBasic.cxx
src/stc/scintilla/lexers/LexBullant.cxx
src/stc/scintilla/lexers/LexCaml.cxx
src/stc/scintilla/lexers/LexCLW.cxx
src/stc/scintilla/lexers/LexCmake.cxx
src/stc/scintilla/lexers/LexCOBOL.cxx
src/stc/scintilla/lexers/LexCoffeeScript.cxx
src/stc/scintilla/lexers/LexConf.cxx
src/stc/scintilla/lexers/LexCPP.cxx
src/stc/scintilla/lexers/LexCrontab.cxx
src/stc/scintilla/lexers/LexCsound.cxx
src/stc/scintilla/lexers/LexCSS.cxx
src/stc/scintilla/lexers/LexD.cxx
src/stc/scintilla/lexers/LexECL.cxx
src/stc/scintilla/lexers/LexEiffel.cxx
src/stc/scintilla/lexers/LexErlang.cxx
src/stc/scintilla/lexers/LexEScript.cxx
src/stc/scintilla/lexers/LexFlagship.cxx
src/stc/scintilla/lexers/LexForth.cxx
src/stc/scintilla/lexers/LexFortran.cxx
src/stc/scintilla/lexers/LexGAP.cxx
src/stc/scintilla/lexers/LexGui4Cli.cxx
src/stc/scintilla/lexers/LexHaskell.cxx
src/stc/scintilla/lexers/LexHTML.cxx
src/stc/scintilla/lexers/LexInno.cxx
src/stc/scintilla/lexers/LexKix.cxx
src/stc/scintilla/lexers/LexLisp.cxx
src/stc/scintilla/lexers/LexLout.cxx
src/stc/scintilla/lexers/LexLua.cxx
src/stc/scintilla/lexers/LexMagik.cxx
src/stc/scintilla/lexers/LexMarkdown.cxx
src/stc/scintilla/lexers/LexMatlab.cxx
src/stc/scintilla/lexers/LexMetapost.cxx
src/stc/scintilla/lexers/LexMMIXAL.cxx
src/stc/scintilla/lexers/LexModula.cxx
src/stc/scintilla/lexers/LexMPT.cxx
src/stc/scintilla/lexers/LexMSSQL.cxx
src/stc/scintilla/lexers/LexMySQL.cxx
src/stc/scintilla/lexers/LexNimrod.cxx
src/stc/scintilla/lexers/LexNsis.cxx
src/stc/scintilla/lexers/LexOpal.cxx
src/stc/scintilla/lexers/LexOScript.cxx
src/stc/scintilla/lexers/LexOthers.cxx
src/stc/scintilla/lexers/LexPascal.cxx
src/stc/scintilla/lexers/LexPB.cxx
src/stc/scintilla/lexers/LexPerl.cxx
src/stc/scintilla/lexers/LexPLM.cxx
src/stc/scintilla/lexers/LexPOV.cxx
src/stc/scintilla/lexers/LexPowerPro.cxx
src/stc/scintilla/lexers/LexPowerShell.cxx
src/stc/scintilla/lexers/LexProgress.cxx
src/stc/scintilla/lexers/LexPS.cxx
src/stc/scintilla/lexers/LexPython.cxx
src/stc/scintilla/lexers/LexR.cxx
src/stc/scintilla/lexers/LexRebol.cxx
src/stc/scintilla/lexers/LexRuby.cxx
src/stc/scintilla/lexers/LexScriptol.cxx
src/stc/scintilla/lexers/LexSmalltalk.cxx
src/stc/scintilla/lexers/LexSML.cxx
src/stc/scintilla/lexers/LexSorcus.cxx
src/stc/scintilla/lexers/LexSpecman.cxx
src/stc/scintilla/lexers/LexSpice.cxx
src/stc/scintilla/lexers/LexSQL.cxx
src/stc/scintilla/lexers/LexTACL.cxx
src/stc/scintilla/lexers/LexTADS3.cxx
src/stc/scintilla/lexers/LexTAL.cxx
src/stc/scintilla/lexers/LexTCL.cxx
src/stc/scintilla/lexers/LexTCMD.cxx
src/stc/scintilla/lexers/LexTeX.cxx
src/stc/scintilla/lexers/LexTxt2tags.cxx
src/stc/scintilla/lexers/LexVB.cxx
src/stc/scintilla/lexers/LexVerilog.cxx
src/stc/scintilla/lexers/LexVHDL.cxx
src/stc/scintilla/lexers/LexVisualProlog.cxx
src/stc/scintilla/lexers/LexYAML.cxx
src/stc/scintilla/lexlib/Accessor.cxx
src/stc/scintilla/lexlib/CharacterSet.cxx
src/stc/scintilla/lexlib/LexerBase.cxx
src/stc/scintilla/lexlib/LexerModule.cxx
src/stc/scintilla/lexlib/LexerNoExceptions.cxx
src/stc/scintilla/lexlib/LexerSimple.cxx
src/stc/scintilla/lexlib/PropSetSimple.cxx
src/stc/scintilla/lexlib/StyleContext.cxx
src/stc/scintilla/lexlib/WordList.cxx
only update stc.h when USE_STC==1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-21 08:40:41 -05:00
src/stc/scintilla/src/AutoComplete.cxx
src/stc/scintilla/src/CallTip.cxx
rebake make/project files for new scintilla git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-14 01:14:27 -04:00
src/stc/scintilla/src/Catalogue.cxx
only update stc.h when USE_STC==1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-21 08:40:41 -05:00
src/stc/scintilla/src/CellBuffer.cxx
src/stc/scintilla/src/CharClassify.cxx
src/stc/scintilla/src/ContractionState.cxx
Update Scintilla to version 1.75 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-14 23:07:00 -05:00
src/stc/scintilla/src/Decoration.cxx
only update stc.h when USE_STC==1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-21 08:40:41 -05:00
src/stc/scintilla/src/Document.cxx
src/stc/scintilla/src/Editor.cxx
src/stc/scintilla/src/ExternalLexer.cxx
src/stc/scintilla/src/Indicator.cxx
src/stc/scintilla/src/KeyMap.cxx
src/stc/scintilla/src/LineMarker.cxx
Apply patch (plus some additional changes) upgrading Scintilla to version 2.03. Closes #11765, #11748, #11346 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-29 23:50:06 -04:00
src/stc/scintilla/src/PerLine.cxx
Update Scintilla to version 1.75 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-14 23:07:00 -05:00
src/stc/scintilla/src/PositionCache.cxx
only update stc.h when USE_STC==1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-21 08:40:41 -05:00
src/stc/scintilla/src/RESearch.cxx
Update Scintilla to version 1.75 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-14 23:07:00 -05:00
src/stc/scintilla/src/RunStyles.cxx
only update stc.h when USE_STC==1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-21 08:40:41 -05:00
src/stc/scintilla/src/ScintillaBase.cxx
Drop the Array class added in the last scintilla patch and switch to using wxVector instead. Closes #11765. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 16:40:32 -04:00
src/stc/scintilla/src/Selection.cxx
only update stc.h when USE_STC==1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-21 08:40:41 -05:00
src/stc/scintilla/src/Style.cxx
src/stc/scintilla/src/UniConversion.cxx
src/stc/scintilla/src/ViewStyle.cxx
src/stc/scintilla/src/XPM.cxx
Bakefile and other changes for new locations of STC and wxSVGFileDC. Remove old files in contrib. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 02:27:23 -04:00
</sources>
</lib>
only update stc.h when USE_STC==1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-21 08:40:41 -05:00
No changes, just remove hard TABs and fix a typo. Separate trivial changes from subsequent commits. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 20:18:51 -04:00
<!-- used to conditionally link against wxscintilla only if it's enabled -->
fixed linking in monolithic case if USE_STC=0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-03 05:32:58 -04:00
<set var="wxscintilla_library_link">
<if cond="USE_STC=='1' and BUILDING_LIB=='1'">wxscintilla</if>
</set>
Bakefile and other changes for new locations of STC and wxSVGFileDC. Remove old files in contrib. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 02:27:23 -04:00
</makefile>
Reference in New Issue Copy Permalink