diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-03 16:36:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-03 16:36:16 +0000 |
| commit | 7d5e8a72b3c88da554293d89fad1d1928b8e5ae2 (patch) | |
| tree | e3c132881f343aa53174882691777c83c2850184 /config_office | |
| parent | 6e245f9b1361989416cc7a5e71c0d8b293d7464a (diff) | |
INTEGRATION: CWS macintel01 (1.86.4); FILE MERGED
2006/01/28 19:50:08 ericb 1.86.4.2: #i61265# macintel01 separate environment files for Intel and PPC based Macs
2006/01/21 20:36:40 ericb 1.86.4.1: #i60955# add unxmacxi architecture for Mac Intel
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/set_soenv.in | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index 28b8ff30c0b2..da55b9d694cd 100644 --- a/config_office/set_soenv.in +++ b/config_office/set_soenv.in @@ -1,8 +1,8 @@ #!@PERL@ -w # # Program: set_soenv.in -# Version: $Revision: 1.88 $ -# Date: $Date: 2006-01-31 18:28:58 $ +# Version: $Revision: 1.89 $ +# Date: $Date: 2006-02-03 17:36:16 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -616,18 +616,31 @@ elsif ( $platform =~ m/cygwin/ ) } elsif ( $platform =~ m/darwin/ ) { print "Setting Mac OS X/Darwin specific values... "; - $outfile = "MacosxEnv.Set"; $BIG_SVX = "TRUE"; $COM = "GCC"; $COMPATH = '@COMPATH@'; - $CPU = "P"; - $CPUNAME = "POWERPC"; + if ($platform =~ m/^i[3456]86/) + { + print "Setting values for Mac OS X/Darwin on Intel... "; + $outfile = "MacOSXIntelEnv.Set"; + $CPU = "I"; + $CPUNAME = "INTEL"; + $DLLSUFFIX = "mxi"; + $OUTPATH = "unxmacxi"; + } + elsif ($platform =~ m/^powerpc/) + { + print "Setting values for Mac OS X/Darwin on PowerPC... "; + $outfile = "MacOSXPPCEnv.Set"; + $CPU = "P"; + $CPUNAME = "POWERPC"; + $DLLSUFFIX = "mxp"; + $OUTPATH = "unxmacxp"; + } $CVER = "C300"; - $DLLSUFFIX = "mxp"; $GUI = "UNX"; $GUIENV = "sal"; $GVER = "VCL"; - $OUTPATH = "unxmacxp"; $INPATH = $OUTPATH.$PROEXT; $GVERDIR = $INPATH; $OS = "MACOSX"; |