From c0b8a8b9cc0c2bfd56426c9a6b6c946ea1031c55 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 23 Jun 2002 14:01:57 +0000 Subject: [PATCH] Applied patch [ 571965 ] update stc contrib stuff git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/stc/Makefile.in | 3 +++ contrib/src/stc/Makefile.in | 2 ++ contrib/src/stc/README.txt | 8 ++++++++ samples/stc/Makefile.in | 3 +++ src/stc/Makefile.in | 2 ++ src/stc/README.txt | 8 ++++++++ 6 files changed, 26 insertions(+) diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in index cffdcc78d7..c9ab5b0261 100644 --- a/contrib/samples/stc/Makefile.in +++ b/contrib/samples/stc/Makefile.in @@ -19,3 +19,6 @@ APPEXTRADEFS=-I$(top_srcdir)/contrib/include DATAFILES=stctest.cpp include $(top_builddir)/src/makeprog.env + +INSTALL:=../../$(INSTALL) + diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index 01b2877cb8..8c64fb6ee9 100644 --- a/contrib/src/stc/Makefile.in +++ b/contrib/src/stc/Makefile.in @@ -68,4 +68,6 @@ APPEXTRADEFS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(scintilla_dir)/src -I$(scint include $(top_builddir)/src/makelib.env +INSTALL:=../../$(INSTALL) + -include $(DEPFILES) diff --git a/contrib/src/stc/README.txt b/contrib/src/stc/README.txt index 46bc58fb01..4b66121e64 100644 --- a/contrib/src/stc/README.txt +++ b/contrib/src/stc/README.txt @@ -44,4 +44,12 @@ wxEvents. Robin +[SOLARIS NOTE - ellers@iinet.net.au - June 2002] + +On sunos5 (sparc) the stc code breaks if optimisation is turned on (the +default). If your release build breaks but the debug build is fine, +try reconfiguring with --disable-optimise and rebuilding. If you are using +wxPython you will also need to disable optimised compiling. To do this I +had to hand modify the python makefile in (prefix)/lib/python2.2/config/Makefile +to remove optimisation flags. diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index cffdcc78d7..c9ab5b0261 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -19,3 +19,6 @@ APPEXTRADEFS=-I$(top_srcdir)/contrib/include DATAFILES=stctest.cpp include $(top_builddir)/src/makeprog.env + +INSTALL:=../../$(INSTALL) + diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in index 01b2877cb8..8c64fb6ee9 100644 --- a/src/stc/Makefile.in +++ b/src/stc/Makefile.in @@ -68,4 +68,6 @@ APPEXTRADEFS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(scintilla_dir)/src -I$(scint include $(top_builddir)/src/makelib.env +INSTALL:=../../$(INSTALL) + -include $(DEPFILES) diff --git a/src/stc/README.txt b/src/stc/README.txt index 46bc58fb01..4b66121e64 100644 --- a/src/stc/README.txt +++ b/src/stc/README.txt @@ -44,4 +44,12 @@ wxEvents. Robin +[SOLARIS NOTE - ellers@iinet.net.au - June 2002] + +On sunos5 (sparc) the stc code breaks if optimisation is turned on (the +default). If your release build breaks but the debug build is fine, +try reconfiguring with --disable-optimise and rebuilding. If you are using +wxPython you will also need to disable optimised compiling. To do this I +had to hand modify the python makefile in (prefix)/lib/python2.2/config/Makefile +to remove optimisation flags.