Changeset cc83ec9 in git


Ignore:
Timestamp:
19/09/11 13:21:47 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/trunk, travis-osx
Children:
f04ae51
Parents:
65ceb41
Message:

buildmacosx.sh: Add comment noting that Xcode is probably required.
Since wxWidgets only supports building for a single arch at a time,
build for i386 by default, which should also work on x86_64. Pass
CPP=cpp to wxWidgets configure (not certain if this is actually
needed, or was something tried on the way to discovering that only
one -arch option can be passed).

git-svn-id: file:///home/survex-svn/survex/trunk@3659 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r65ceb41 rcc83ec9  
     1Mon Sep 19 11:52:50 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * buildmacosx.sh: Add comment noting that Xcode is probably required.
     4          Since wxWidgets only supports building for a single arch at a time,
     5          build for i386 by default, which should also work on x86_64.  Pass
     6          CPP=cpp to wxWidgets configure (not certain if this is actually
     7          needed, or was something tried on the way to discovering that only
     8          one -arch option can be passed).
     9
    110Sun Sep 18 12:24:41 GMT 2011  Olly Betts <olly@survex.com>
    211
  • buildmacosx.sh

    r65ceb41 rcc83ec9  
    55#
    66# Currently (at least if built on 10.6) 10.6 is required to run.
     7#
     8# You probably need to have Xcode installed - you can download this for free
     9# from Apple: http://developer.apple.com/xcode/
    710#
    811# Run from the unpacked survex-1.1.X directory like so:
     
    3639WXVERSION=2.8.12
    3740
    38 # To build for older machines with a ppc CPU, you want -arch ppc instead in
    39 # arch_flags (might also work as well with some OS X versions).
    40 arch_flags='-arch i386 -arch x86_64'
     41# Sadly, you can only specify one arch via -arch at a time (a restriction of
     42# the wxWidgets build system).
     43#
     44# Using -arch i386 produces a build which will also work on 64-bit Intel Macs.
     45# If you want a build which *only* works on 64 bit Intel Macs, then use
     46# arch_flags='-arch x86_64' instead.
     47#
     48# To build for older machines with a ppc CPU, you want arch_flags='-arch ppc'
     49# instead.
     50arch_flags='-arch i386'
    4151if [ -z "${WX_CONFIG+set}" ] && [ "x$1" != "x--no-install-wx" ] ; then
    4252  if test -x WXINSTALL/bin/wx-config ; then
     
    5161    test -d "wxWidgets-$WXVERSION/build" || "mkdir wxWidgets-$WXVERSION/build"
    5262    cd "wxWidgets-$WXVERSION/build"
    53     ../configure --disable-shared --prefix="$prefix" --with-opengl --enable-unicode CC="gcc $arch_flags" CXX="g++ $arch_flags"
     63    ../configure --disable-shared --prefix="$prefix" --with-opengl --enable-unicode CC="gcc $arch_flags" CXX="g++ $arch_flags" CPP=cpp
    5464    make -s
    5565    make -s install
Note: See TracChangeset for help on using the changeset viewer.