diff --git a/development/Makefile.am b/development/Makefile.am index d0e96dd2ec..0fef79d716 100644 --- a/development/Makefile.am +++ b/development/Makefile.am @@ -3,4 +3,4 @@ include $(top_srcdir)/config/common.am EXTRA_DIST = boostworkaround.txt ChangeLog Code_rules FORMAT \ gettext.patch lazy_lyxtext.txt lyx3 lyx.rpm.README \ lyxserver lyx.spec.in lyx.spec MacOSX OS2 Seminar.txt \ - TodoPlan-1.3 tools Win32 + TodoPlan-1.3 tools Win32 scons cmake diff --git a/status.14x b/status.14x index f3e536ec7d..608af9b70e 100644 --- a/status.14x +++ b/status.14x @@ -162,7 +162,9 @@ What's new - A scons build system is added, for details please see INSTALL.scons. -- LyX can be compiled with MSVC using qt3 from the Q../Free project and scons. +- CMmake build system added, for details see /development/cmake/README.cmake + +- LyX can be compiled with MSVC using qt3 from the Q../Free project and scons or CMake. - 'scons install' now produces a cygwin-compatible binary package under cygwin.