Commit e57c9d23 authored by Eric J. Korpela's avatar Eric J. Korpela

- MacOS: Changes to allow command line builds on MacOS 10.3

    - New preprocessor symbol DARWIN_10_3 is defined in config.h when 
      configure script detects MacOS 10.3
    - Added explicit include of config.h in some files in lib/mac


svn path=/trunk/boinc/; revision=13771
parent 8403c6f5
......@@ -9093,3 +9093,17 @@ Rytis 3 Oct 2007
en.po
user/
forum_pm.php
Eric K 3 Oct 2007
- MacOS: Changes to allow command line builds on MacOS 10.3
- New preprocessor symbol DARWIN_10_3 is defined in config.h when configure
script detects MacOS 10.3
- Added explicit include of config.h in some files in lib/Mac
configure.ac
lib/
mac/
QSymbols.c
QCrashReport.[ch]
QMachOImage.[ch]
......@@ -143,6 +143,7 @@ AC_PROG_CPP
AC_PROG_MAKE_SET
AC_PROG_RANLIB
SAH_LINKS
AM_PROG_CC_C_O
AC_SUBST([CLIENT_BIN_FILENAME],[boinc${EXEEXT}])
AC_SUBST([CLIENT_CMD_BIN_FILENAME],[boinccmd${EXEEXT}])
......@@ -556,6 +557,12 @@ dnl ----------------------------------------------------------------------------
dnl Heres another way to set up host-specific stuff
AM_CONDITIONAL(OS_DARWIN, [echo $host_os | grep '^darwin' > /dev/null])
if echo $host_os | grep '^darwin' >/dev/null ; then
if test `uname -r | sed 's/\.//g'` -lt 800 ; then
AC_DEFINE_UNQUOTED(DARWIN_10_3, [1],[Define to 1 if compiling under OS X 10.3 or earlier])
fi
fi
AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep '^linux' > /dev/null])
dnl In case anyone wants to try building the windows code using mingw!
AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null])
......
......@@ -107,6 +107,7 @@ First checked in.
/////////////////////////////////////////////////////////////////
#include "config.h"
#include "QCrashReport.h"
// System interfaces
......@@ -1466,4 +1467,4 @@ extern int QCRGetParentTask(task_t *taskPtr)
return err;
}
#endif // Not used by BOINC
\ No newline at end of file
#endif // Not used by BOINC
......@@ -125,6 +125,7 @@ First checked in.
}
#endif
#include "QMachOImage.h"
#include "QBacktrace.h"
/////////////////////////////////////////////////////////////////
......
......@@ -108,7 +108,7 @@ First checked in.
/////////////////////////////////////////////////////////////////
// Our prototypes
#include "config.h"
#include "QMachOImage.h"
// Basic system interfaces
......
......@@ -125,6 +125,22 @@ First checked in.
#if defined(__cplusplus)
}
#endif
/////////////////////////////////////////////////////////////////
// Fixes for compiling on 10.3 and earlier //
/////////////////////////////////////////////////////////////////
#ifdef DARWIN_10_3
#define nlist_64 nlist
#define mach_header_64 mach_header
#define segment_command_64 segment_command
#define section_64 section
#define reserved3 reserved2
#define MH_MAGIC_64 0x0ffffff0
#define MH_CIGAM_64 0x00ffffff
#define LC_SEGMENT_64 0x00fffff9
#undef MH_CIGAM
#define MH_CIGAM 0xcefaedfe
#endif
/////////////////////////////////////////////////////////////////
#include "QTaskMemory.h" // for the QTMAddr type
......@@ -256,6 +272,8 @@ extern int QMOImageCreateFromFile(
QMOImageRef * qmoImagePtr
);
/*!
@function QMOImageCreateFromLocalImage
......
......@@ -111,7 +111,7 @@ First checked in.
/////////////////////////////////////////////////////////////////
// Our Prototypes
#include "config.h"
#include "QSymbols.h"
// Mac OS Interfaces
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment