Commit Graph

22 Commits

Author SHA1 Message Date
Robin Dunn
6342ec7aba 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 05:14:27 +00:00
Vadim Zeitlin
2cf6960074 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 15:26:31 +00:00
Vadim Zeitlin
2a9b583b48 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 12:49:25 +00:00
Vadim Zeitlin
1907df9d5b 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-22 01:22:17 +00:00
Vadim Zeitlin
02c9115ba8 Always define WXUSINGDLL when compiling Scintilla in shared wx build.
We need WXUSINGDLL even in monolithic build because Scintilla references wx
debugging functions (wxOnAssert(), wxTheAssertHandler &c) which still must be
seen as being exported from the (monolithic) DLL in this case.

See #12626.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:07 +00:00
Vadim Zeitlin
5eda55f775 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 21:37:22 +00:00
Václav Slavík
0a9c5e3564 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 19:33:11 +00:00
Vadim Zeitlin
354a9ddf94 Only define WXUSINGDLL in multilib builds for wxscintilla.lib.
In monolithic builds wxscintilla is linked directly into the one and only wx
DLL and doesn't need to import anything from it, WXUSINGDLL is only needed in
multilib case when wxscintilla is part of wxCore DLL and does need to import
symbols (e.g. wxQsort() used by wxVector) from wxBase one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 18:39:22 +00:00
Vadim Zeitlin
6d50f0a0ed 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-25 00:19:06 +00:00
Vadim Zeitlin
1ba904fea1 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-25 00:18:57 +00:00
Vadim Zeitlin
1784742ca7 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-25 00:18:51 +00:00
Robin Dunn
b5fe65c819 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 20:40:32 +00:00
Robin Dunn
9e96e16fe0 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-30 03:50:06 +00:00
Vadim Zeitlin
ab5c51e5b2 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 09:13:36 +00:00
Vadim Zeitlin
d84e6f500e 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 23:12:57 +00:00
Vadim Zeitlin
d2eb1696ce 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 13:40:41 +00:00
Vadim Zeitlin
13c048017f 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 23:29:45 +00:00
Robin Dunn
7e0c58e92c 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-15 04:07:00 +00:00
Václav Slavík
303a585db2 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 09:32:58 +00:00
Václav Slavík
7708a26720 don't build wxscintilla lib if wxSTC is not built
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-08 13:59:16 +00:00
Robin Dunn
18cea8715a Patch from FM with more bakefile tweaks and etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 18:26:59 +00:00
Robin Dunn
54429bb380 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 06:27:23 +00:00