some support for pch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8947 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2004-08-15 21:45:30 +00:00
parent 1af89221c3
commit b0fbc29aa3
42 changed files with 421 additions and 20 deletions

View File

@ -1,3 +1,11 @@
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* lyxinclude.m4 (lyx_pch_comp,LYX_BUILD_PCH): set this for
precompiled header capable gcc compilers
* common.am (pch.h.gch,LYX_BUILD_PCH): support for precompiled
headers
2004-07-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* lyxinclude.m4: setup for gcc 3.5 use as well

View File

@ -8,6 +8,15 @@ AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
AM_ETAGSFLAGS = --lang=c++
if LYX_BUILD_PCH
PCH_FLAGS = -Winvalid-pch --include=pch.h
PCH_FILE = pch.h.gch
endif
pch.h.gch:
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -x c++-header pch.h
if USE_INCLUDED_BOOST
BOOST_INCLUDES = -I$(top_srcdir)/boost
endif

View File

@ -195,6 +195,8 @@ case $enable_optimization in
*) lyx_opt=${enable_optimization};;
esac
lyx_pch_comp=no
# set the debug flags correctly.
if test x$GXX = xyes; then
dnl Useful for global version info
@ -212,7 +214,9 @@ if test x$GXX = xyes; then
3.1*) CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";;
3.2*) CXXFLAGS="$lyx_opt -fno-exceptions";;
3.3*) CXXFLAGS="$lyx_opt -fno-exceptions";;
3.4*|3.5*) CXXFLAGS="$lyx_opt -fno-exceptions";;
3.4*|3.5*)
CXXFLAGS="$lyx_opt -fno-exceptions"
lyx_pch_comp=yes;;
*) CXXFLAGS="$lyx_opt";;
esac
if test x$enable_debug = xyes ; then
@ -235,7 +239,9 @@ if test x$GXX = xyes; then
*) CXXFLAGS="$CXXFLAGS -Wextra -Wall";;
esac
fi
fi])dnl
fi
AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes)
])dnl
dnl NOT USED CURRENTLY*************************************

View File

@ -13,4 +13,4 @@ version.C-tmp
stamp-version
*.deps
.libs
a.out
pch.h.gch

View File

@ -1,3 +1,9 @@
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: new file
* Makefile.am: support pch
2004-08-15 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* text.C (readParToken): remove the static LyXFont variable and
@ -11,15 +17,15 @@
* rowpainter.C (paintText): reduce number of calls to singleWidth
* paragraph.C (isHfill):
* paragraph.C (isHfill):
(isNewline): ws only
2004-08-14 André Pönitz <poenitz@gmx.net>
* text.C:
* text2.C:
* rowpainter.C:
* lyxtext.h (several functions): use a Paragraph & argument
* lyxtext.h (several functions): use a Paragraph & argument
instead of par_type
2004-08-15 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
@ -34,7 +40,7 @@
* tabular.h: remove bogus comments
* tabular.C (getDescentOfRow):
* tabular.C (getDescentOfRow):
(isPartOfMultiColumn): add assertions
* lyxlength.C (inPixels): remove #warning
@ -42,7 +48,7 @@
2004-08-14 André Pönitz <poenitz@gmx.net>
* paragraph.h: inline getChar()
* BufferView.h: remove unused declarations
2004-08-14 José Matos <jamatos@lyx.org>
@ -98,7 +104,7 @@
* Makefile.am: new files to accomodate an 'external' (x,y)-position
cache for all insets in (at least partially) visible (top-level)
paragraphs.
* BufferView_pimpl.C: reset external coord cache before every update.
This means the coord cache only contains valid entries.

View File

@ -56,6 +56,10 @@ INCLUDES = $(BOOST_INCLUDES)
BUILT_SOURCES = version.C
AM_CXXFLAGS = $(PCH_FLAGS)
lyx_DEPENDENCIES = $(PCH_FILE)
lyx_SOURCES = \
Bidi.C \
Bidi.h \

View File

@ -4,3 +4,4 @@ Makefile.in
*.lo
.libs
libfrontends.la
pch.h.gch

View File

@ -1,3 +1,9 @@
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: new file
* Makefile.am: support pch
2004-07-22 Lars Gullik Bjonnes <larsbj@gullik.net>
* lyx_gui.h (set_read_callback,remove_read_callback): remove

View File

@ -8,6 +8,10 @@ noinst_LTLIBRARIES = libfrontends.la
INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
libfrontends_la_DEPENDENCIES = $(PCH_FILE)
libfrontends_la_SOURCES = \
Alert.C \
Alert.h \

View File

@ -4,3 +4,4 @@ Makefile
*.lo
.libs
libcontrollers.la
pch.h.gch

View File

@ -1,3 +1,9 @@
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: new file
* Makefile.am: support pch
2004-08-08 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* helper_funcs.C (browseLibFile): new function. Tries to do the

View File

@ -6,8 +6,10 @@ INCLUDES = -I$(top_srcdir)/src $(BOOST_INCLUDES)
noinst_LTLIBRARIES = libcontrollers.la
AM_CXXFLAGS = $(PCH_FLAGS)
libcontrollers_la_SOURCES= \
Dialog.C \
$(PCH_FILE) Dialog.C \
Dialog.h \
Kernel.C \
Kernel.h \

View File

@ -0,0 +1,17 @@
#include <config.h>
#include <boost/cregex.hpp>
#include <boost/regex.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/utility.hpp>
#include <algorithm>
#include <fstream>
#include <iosfwd>
#include <list>
#include <map>
#include <sstream>
#include <string>
#include <utility>
#include <vector>

20
src/frontends/pch.h Normal file
View File

@ -0,0 +1,20 @@
#include <config.h>
#include <boost/function.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signal.hpp>
#include <boost/signals/signal0.hpp>
#include <boost/signals/signal1.hpp>
#include <boost/signals/signal2.hpp>
#include <boost/signals/trackable.hpp>
#include <boost/utility.hpp>
#include <sys/time.h>
#include <unistd.h>
#include <limits>
#include <map>
#include <string>
#include <utility>
#include <vector>

View File

@ -6,3 +6,4 @@ Makefile
libqt2.la
moc_*.C
*_moc.C
pch.h.gch

View File

@ -1,8 +1,20 @@
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* qfontexample.h: add header guards
* qcoloritem.h: add header guards
* floatplacement.h: add header guards
* pch.h: new file
* Makefile.am: support pch
2004-08-11 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Fix problem with the menu merging functionality of Qt/Mac. All the
code below is #ifdef Q_WS_MACX.
* QLPopupMenu.C (showing): append dummy entries to one menu (so that
Qt/Mac moves them to the LyX menu) and give them special index value.
(fire): if index is more than indexOffset, dispatch to the
@ -17,7 +29,7 @@
2004-08-14 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* QPrefsDialog.C (change_color):
* QPrefsDialog.C (change_color):
* QDocumentDialog.C (toggleBranchColor): set the parent of the
color picker correctly.

View File

@ -14,7 +14,10 @@ noinst_LTLIBRARIES = libqt2.la
libqt2_la_LDFLAGS = $(QT_LDFLAGS)
libqt2_la_LIBADD = $(QT_LIB) ui/*.lo moc/*.lo ui/moc/*.lo
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
AM_CXXFLAGS = $(PCH_FLAGS) -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
libqt2_la_DEPENDENCIES = $(PCH_FILE)
libqt2_la_SOURCES = \
QDialogView.C \

View File

@ -10,6 +10,9 @@
* Full author contact details are available in file CREDITS.
*/
#ifndef QT_FLOATPLACEMENT_H
#define QT_FLOATPLACEMENT_H
#include <qwidget.h>
#include <string>
@ -56,3 +59,5 @@ private:
QCheckBox * bottomCB;
QCheckBox * topCB;
};
#endif

37
src/frontends/qt2/pch.h Normal file
View File

@ -0,0 +1,37 @@
// -*- C++ -*-
#include <config.h>
#include <boost/array.hpp>
#include <boost/assert.hpp>
#include <boost/function.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signals/trackable.hpp>
#include <boost/signal.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/utility.hpp>
#include <algorithm>
#include <cmath>
#include <iomanip>
#include <limits.h>
#include <map>
#include <sstream>
#include <stack>
#include <string>
#include <utility>
#include <vector>
// Have I said anything about the braindeadness of QT lately?
// Just to remind you: signals slot emit as macros, pure lunacy!
// So we are not able to have any qt headers in the pch.
// #include <qt.h>
// #define qtsignal signal
// #define qtsignals signals
// #define qtemit emit
// #undef signal
// #undef signals
// #undef emit

View File

@ -9,6 +9,9 @@
* Full author contact details are available in file CREDITS.
*/
#ifndef QT_QCOLORITEM_H
#define QT_QCOLORITEM_H
#include <qlistbox.h>
#include <qcolor.h>
@ -47,3 +50,5 @@ private:
QString text_;
};
#endif

View File

@ -9,6 +9,9 @@
* Full author contact details are available in file CREDITS.
*/
#ifndef QT_QFONTEXAMPLE_H
#define QT_QFONTEXAMPLE_H
#include <qwidget.h>
#include <qfont.h>
@ -29,3 +32,5 @@ private:
QFont font_;
QString text_;
};
#endif

View File

@ -10,3 +10,4 @@ stamp-forms
lyx_xpm.h
lyx_xpm.h-tmp
stamp-xpm
pch.h.gch

View File

@ -1,3 +1,9 @@
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: new file
* Makefile.am: support pch
2004-08-08 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* FormBibtex.C (input): use ControlBibtex::browseBst and

View File

@ -12,10 +12,14 @@ INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends/controllers \
$(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
noinst_LTLIBRARIES = libxforms.la
libxforms_la_LIBADD = @XFORMS_LIBS@ forms/*.lo
libxforms_la_DEPENDENCIES = $(PCH_FILE)
# Alphabetical order please. It makes it easier to figure out what's missing.
libxforms_la_SOURCES = \
forms_fwd.h \

View File

@ -0,0 +1,32 @@
#include <config.h>
#include <X11/forms.h>
#include <X11/keysym.h>
#include <X11/X.h>
#include <X11/X.h> // Window
#include <X11/Xlib.h>
#include <X11/Xlib.h> // for Pixmap
#include <X11/Xlib.h> // for Pixmap, GC
#include <X11/xpm.h>
#include <boost/assert.hpp>
#include <boost/regex.hpp>
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signals/connection.hpp>
#include <boost/signals/signal0.hpp>
#include <boost/signals/trackable.hpp>
#include <boost/tuple/tuple.hpp>
#include <algorithm>
#include <cmath>
#include <fcntl.h>
#include <fstream>
#include <iomanip>
#include <list>
#include <map>
#include <sstream>
#include <string>
#include <utility>
#include <vector>

View File

@ -4,3 +4,4 @@ Makefile
*.lo
.libs
libgraphics.la
pch.h.gch

View File

@ -1,3 +1,9 @@
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: new file
* Makefile.am: support pch
2004-07-24 Lars Gullik Bjonnes <larsbj@gullik.net>
* PreviewLoader.C, GraphicsParams.C, GraphicsConverter.C: change

View File

@ -4,8 +4,10 @@ noinst_LTLIBRARIES = libgraphics.la
INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
libgraphics_la_SOURCES = \
GraphicsCache.h \
$(PCH_FILE) GraphicsCache.h \
GraphicsCache.C \
GraphicsCacheItem.h \
GraphicsCacheItem.C \

18
src/graphics/pch.h Normal file
View File

@ -0,0 +1,18 @@
#include <config.h>
#include <boost/function/function0.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signals/signal0.hpp>
#include <boost/signals/signal1.hpp>
#include <boost/utility.hpp>
#include <fstream>
#include <iomanip>
#include <iosfwd>
#include <queue>
#include <set>
#include <sstream>
#include <string>
#include <utility>
#include <vector>

View File

@ -4,3 +4,4 @@ Makefile
*.lo
.libs
libinsets.la
pch.h.gch

View File

@ -1,3 +1,9 @@
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: new file
* Makefile.am: support pch
2004-08-15 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* insettabular.C (draw): whitespace
@ -17,7 +23,7 @@
* insetinclude.C (priv_dispatch): fix showing dialog on mouse
release
(metrics): the insets is not full width any more.
(metrics): the insets is not full width any more.
(draw): adjust; fix bad test for PREVIEW_OFF
(add_preview): fix bad test for PREVIEW_OFF
(display): do not return true when using \input
@ -36,7 +42,7 @@
* insetcaption.C (InsetCaption): modify call to setDrawFrame
* insetcollapsable.C (InsetCollapsable): ditto
* insetenv.C (InsetEnvironment): ditto
2004-08-14 André Pönitz <poenitz@gmx.net>
* inset.[Ch]:

View File

@ -8,8 +8,12 @@ EXTRA_DIST = \
insettheorem.C \
insettheorem.h
AM_CXXFLAGS = $(PCH_FLAGS)
libinsets_la_DEPENDENCIES = $(PCH_FILE)
libinsets_la_SOURCES = \
mailinset.C \
$(PCH_FILE) mailinset.C \
mailinset.h \
ExternalSupport.C \
ExternalSupport.h \

22
src/insets/pch.h Normal file
View File

@ -0,0 +1,22 @@
#include <config.h>
#include <boost/any.hpp>
#include <boost/assert.hpp>
#include <boost/function.hpp>
#include <boost/regex.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/signals/connection.hpp>
#include <boost/signals/signal0.hpp>
#include <boost/signals/trackable.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/utility.hpp>
#include <cmath>
#include <fstream>
#include <iosfwd>
#include <iostream>
#include <map>
#include <memory>
#include <sstream>
#include <string>
#include <vector>

View File

@ -4,3 +4,4 @@ Makefile
*.lo
.libs
libmathed.la
pch.h.gch

View File

@ -1,3 +1,9 @@
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: new file
* Makefile.am: support pch
2004-08-13 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* math_nestinset.C (editXY): constify
@ -10,7 +16,7 @@
2004-08-12 André Pönitz <poenitz@gmx.net>
* math_nestinset.C: Fix #1249
* math_parser.C: Fix: #928
2004-07-24 Lars Gullik Bjonnes <larsbj@gullik.net>

View File

@ -6,8 +6,12 @@ noinst_LTLIBRARIES = libmathed.la
INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
libmathed_la_DEPENDENCIES = $(PCH_FILE)
libmathed_la_SOURCES = \
textpainter.C \
$(PCH_FILE) textpainter.C \
textpainter.h \
math_amsarrayinset.C \
math_amsarrayinset.h \

13
src/mathed/pch.h Normal file
View File

@ -0,0 +1,13 @@
#include <config.h>
#include <boost/assert.hpp>
#include <boost/scoped_ptr.hpp>
#include <algorithm>
#include <fstream>
#include <iosfwd>
#include <iterator>
#include <map>
#include <sstream>
#include <string>
#include <vector>

58
src/pch.h Normal file
View File

@ -0,0 +1,58 @@
#include <config.h>
#include <boost/any.hpp>
#include <boost/array.hpp>
#include <boost/assert.hpp>
#include <boost/crc.hpp>
#include <boost/cregex.hpp>
#include <boost/current_function.hpp>
#include <boost/format.hpp>
#include <boost/function/function0.hpp>
#include <boost/function.hpp>
#include <boost/iterator/indirect_iterator.hpp>
#include <boost/optional.hpp>
#include <boost/regex.hpp>
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signals/connection.hpp>
#include <boost/signals/signal0.hpp>
#include <boost/signals/signal1.hpp>
#include <boost/signals/signal2.hpp>
#include <boost/signals/trackable.hpp>
#include <boost/test/detail/nullstream.hpp>
#include <boost/tokenizer.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/utility.hpp>
#include <fcntl.h>
#include <sys/select.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <algorithm>
#include <cerrno>
#include <clocale>
#include <csignal>
#include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <deque>
#include <exception>
#include <fstream>
#include <functional>
#include <iomanip>
#include <ios>
#include <iosfwd>
#include <iostream>
#include <iterator>
#include <list>
#include <map>
#include <queue>
#include <set>
#include <sstream>
#include <stack>
#include <string>
#include <utility>
#include <utime.h>
#include <vector>

View File

@ -5,3 +5,4 @@ Makefile
libsupport.la
.libs
path_defines.C
pch.h.gch

View File

@ -1,3 +1,9 @@
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: new file
* Makefile.am: support pch
2004-08-09 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* globbing.C (FileFilterList): make sure that "All files (*)" is

View File

@ -14,8 +14,10 @@ endif
BUILT_SOURCES = path_defines.C
AM_CXXFLAGS = $(PCH_FLAGS)
libsupport_la_SOURCES = \
FileInfo.C \
$(PCH_FILE) FileInfo.C \
FileInfo.h \
FileMonitor.h \
FileMonitor.C \

49
src/support/pch.h Normal file
View File

@ -0,0 +1,49 @@
#include <config.h>
#include <boost/assert.hpp>
#include <boost/crc.hpp>
#include <boost/format.hpp>
#include <boost/function/function0.hpp>
#include <boost/iterator/indirect_iterator.hpp>
#include <boost/regex.hpp>
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signals/signal0.hpp>
#include <boost/signals/signal2.hpp>
#include <boost/signals/trackable.hpp>
#include <boost/test/detail/nullstream.hpp>
#include <boost/tokenizer.hpp>
#include <boost/utility.hpp>
#include <fcntl.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/un.h>
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
#include <algorithm>
#include <cctype>
#include <cerrno>
#include <csignal>
#include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <ctime>
#include <deque>
#include <fstream>
#include <functional>
#include <iostream>
#include <istream>
#include <iterator>
#include <list>
#include <map>
#include <ostream>
#include <queue>
#include <sstream>
#include <string>
#include <utility>
#include <vector>