diff --git a/ChangeLog b/ChangeLog index afc8039472..4cca679d2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-09-22 Bennett Helm + + * README.MacOSX: update a bit + 2004-09-04 Lars Gullik Bjonnes * configure.ac (AC_CONFIG_FILES): add src/client/Makefile diff --git a/README.MacOSX b/README.MacOSX index 515d5a4040..84183e7383 100644 --- a/README.MacOSX +++ b/README.MacOSX @@ -2,6 +2,7 @@ Building LyX/Mac-1.4.0 Ronald Florence + Modified by Bennett Helm LyX/Mac is built from the LyX source, the GPL-licensed Trolltech Qt/Mac library, and a custom application bundle. @@ -12,32 +13,16 @@ to "setenv VAR value". 1. Download the GPL-licensed Qt/Mac library source code from - , + , untar in a convenient directory, cd to the top of the Qt source hierarcy, and: export QTDIR=`pwd` - patch -p0 < LYX-SOURCE-DIRECTORY/development/MacOSX/qt.patch - sudo gcc_select 3.3 - ./configure -static [for Panther, use "./configure -static -lresolv"] + sudo gcc_select 3.3 + ./configure -static -no-exceptions [for Panther, use "./configure -static -no-exceptions -lresolv"] make rm lib/libqt.la - Adendum, 19 May 2004. From comments by Jean-Marc - There now appears to be no need for this patch. - - a. The additional line - +{ '^', MAP_KEY(Qt::Key_AsciiCircum) }, - is fixed already in Qt/Mac 3.3.x. - - b. The line commenting out 'ControlRef' to prevent a name - clash is also fixed in recent versions of the Qt library. - - These instructions are still there in README.OSX because the 1.3.x - port relies on qt 3.1.x (because of other problems, I believe). - - For the 1.4.x port, Bennett Helm aims at using the latest Qt version - with the current gcc 3 compiler. 2. Download the LyX/Mac skeleton from @@ -49,7 +34,7 @@ library, cd to the top of the LyX source hierarchy, and: export LDFLAGS="-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -lz" - ./configure --with-frontend=qt --without-x --datadir=/Applications/LyX.app/Contents/Resources --bindir=/Applications/LyX.app/Contents/MacOS --mandir=/Applications/LyX.app/Contents/Resources/man + ./configure --with-frontend=qt --without-x --datadir=/Applications/LyX.app/Contents/Resources --bindir=/Applications/LyX.app/Contents/MacOS --mandir=/Applications/LyX.app/Contents/Resources/man --enable-maintainer-mode --with-included-gettext --enable-optimization=-Os make make install rm /Applications/LyX.app/Contents/Resources/LyX/images/lyx.xpm