mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-04 14:20:05 +00:00
fix building on OSX 10.4
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10724 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
9271d2e265
commit
7c1ecddb82
@ -1,3 +1,7 @@
|
||||
2006-01-11 Bennett Helm <bennett.helm@fandm.edu>
|
||||
|
||||
* INSTALL.MacOSX: update.
|
||||
|
||||
2005-07-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* NEWS: fix typo
|
||||
|
@ -21,10 +21,15 @@ convenient directory, cd to the top of the Qt source hierarcy, and:
|
||||
|
||||
export QTDIR=`pwd`
|
||||
sudo gcc_select 2
|
||||
./configure -static -no-exceptions [for Panther, use "./configure -static -no-exceptions -lresolv"]
|
||||
./configure -static -no-exceptions [for 10.3 or higher, use "./configure -static -no-exceptions -lresolv"]
|
||||
make
|
||||
rm lib/libqt.la
|
||||
|
||||
[Note: LyX-1.3.x requires gcc-2.95 to compile (hence the 'sudo
|
||||
gcc_select 2' line above). In Mac OS X 10.4, gcc-2.95 is not
|
||||
installed by default, though it is included with the Xcode Tools
|
||||
installer (under Cross-Development).]
|
||||
|
||||
3. Configure LyX for compilation as follows.
|
||||
|
||||
Using the same terminal session you used to build the Qt library,
|
||||
@ -36,7 +41,8 @@ cd to the top of the LyX source hierarchy, and enter:
|
||||
[Note #1: Adjust the --prefix setting to point to where you have
|
||||
copied LyX.app from step (1), if necessary.]
|
||||
|
||||
[Note #2: to make a build that works with both 10.2 and 10.3, include
|
||||
[Note #2: to make a build that works with Mac OS X 10.2 and higher,
|
||||
include
|
||||
"am_cv_func_iconv=no ac_cv_func_tsearch=no ac_cv_working_alloca_h=no ac_cv_header_dlfcn_h=no ac_cv_func_feof_unlocked=no ac_cv_header_nl_types_h=no am_cv_langinfo_codeset=no ac_cv_func_stpcpy=no"
|
||||
in the configure line.]
|
||||
|
||||
|
@ -1,3 +1,10 @@
|
||||
2006-01-11 Bennett Helm <bennett.helm@fandm.edu>
|
||||
|
||||
* QWorkArea.C:
|
||||
* lyx_gui.C:
|
||||
* qfont_loader.C: define __METADATA_METADATA__ under OSX to fix
|
||||
compilation with gcc 2.95.
|
||||
|
||||
2006-01-09 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||
|
||||
* Alert_pimpl.C: Make alert dialogs modular, thus preventing that
|
||||
|
@ -35,6 +35,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#define __METADATA_METADATA__ 1
|
||||
#include <Carbon/Carbon.h>
|
||||
#endif
|
||||
|
||||
|
@ -43,6 +43,7 @@
|
||||
#include "io_callback.h"
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#define __METADATA_METADATA__ 1
|
||||
#include <Carbon/Carbon.h>
|
||||
#endif
|
||||
|
||||
|
@ -40,6 +40,7 @@ using std::pair;
|
||||
using std::make_pair;
|
||||
|
||||
#ifdef Q_WS_MACX
|
||||
#define __METADATA_METADATA__ 1
|
||||
#include <ApplicationServices/ApplicationServices.h>
|
||||
#endif
|
||||
|
||||
|
@ -1,3 +1,8 @@
|
||||
2006-01-11 Bennett Helm <bennett.helm@fandm.edu>
|
||||
|
||||
* package.C: define __METADATA_METADATA__ under OSX to fix
|
||||
compilation with gcc 2.95.
|
||||
|
||||
2005-09-30 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* os_win32.h: new file, providing a public and portable interface
|
||||
|
@ -39,6 +39,7 @@
|
||||
|
||||
|
||||
#if defined (USE_MACOSX_PACKAGING)
|
||||
#define __METADATA_METADATA__ 1
|
||||
# include <CoreServices/CoreServices.h> // FSFindFolder, FSRefMakePath
|
||||
#endif
|
||||
|
||||
|
@ -19,9 +19,9 @@ What's new
|
||||
|
||||
** Updates
|
||||
|
||||
- update lyx2lyx to handle properly the latest LyX 1.4 format (245).
|
||||
- Update lyx2lyx to handle properly the latest LyX 1.4 format (245).
|
||||
|
||||
- New hungarian translation.
|
||||
- New hungarian translation. Update Spanish translation.
|
||||
|
||||
- Update German documentation.
|
||||
|
||||
@ -89,7 +89,10 @@ What's new
|
||||
- Compile without STL compatibility support, since some systems do that
|
||||
by default (Slackware, for ex.). [Qt only]
|
||||
|
||||
- fix compilation with Solaris/x86 (bug 992).
|
||||
- Fix compilation with gcc 2.95 under OSX 10.4. This is useful because
|
||||
LyX crashes on startup when compiled with gcc3.
|
||||
|
||||
- Fix compilation with Solaris/x86 (bug 992).
|
||||
|
||||
- Enable compilation of LyX on DragonFly BSD.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user