Changeset b7510ee in git


Ignore:
Timestamp:
23/07/10 06:57:36 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/tags/1.1.14, svn/tags/1.1.15, svn/tags/1.1.16, 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:
5297c43
Parents:
a75f5a1
Message:

buildmacosx.sh: Update to use WX_CONFIG not WXCONFIG. Update to
use a Unicode build. If building a private wx, use wx 2.8.11 not
2.7.0-1 (and don't replace carbon-glcanvas.cpp with our own version).

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    ra75f5a1 rb7510ee  
     1Fri Jul 23 05:55:37 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * buildmacosx.sh: Update to use WX_CONFIG not WXCONFIG.  Update to
     4          use a Unicode build.  If building a private wx, use wx 2.8.11 not
     5          2.7.0-1 (and don't replace carbon-glcanvas.cpp with our own version).
     6
    17Sat Jul 10 12:15:23 GMT 2010  Olly Betts <olly@survex.com>
    28
  • buildmacosx.sh

    ra75f5a1 rb7510ee  
    2020# something like this:
    2121#
    22 #   env WXCONFIG=/path/to/wx-config ./buildmacosx.sh
     22#   env WX_CONFIG=/path/to/wx-config ./buildmacosx.sh
    2323#
    2424# If using a pre-installed wxWidgets, note that it must satisfy the
     
    2626#   - It must be built with OpenGL support (--with-opengl).
    2727#   - It must be the Carbon version.
    28 #   - It must be a "non-unicode" build.
     28#   - It probably should be a "Unicode" build (--enable-unicode).
    2929#
    3030
    3131set -e
    3232
    33 WXVERSION=2.7.0-1
     33WXVERSION=2.8.11
    3434
    3535if test "x$1" = "x--install-wx" ; then
     
    4242    test -d wxWidgets-$WXVERSION || tar jxvf wxWidgets-$WXVERSION.tar.bz2
    4343    test -d wxWidgets-$WXVERSION/build || mkdir wxWidgets-$WXVERSION/build
    44     # wx's Carbon glcanvas is unsatisfactory, so for now we use our own.
    45     cp src/carbon-glcanvas.cpp wxWidgets-$WXVERSION/src/mac/carbon/
    4644    cd wxWidgets-$WXVERSION/build
    47     ../configure --disable-shared --prefix="$prefix" --with-opengl
     45    ../configure --disable-shared --prefix="$prefix" --with-opengl --enable-unicode
    4846    make -s
    4947    make -s install
    5048    cd ../..
    5149  fi
    52   WXCONFIG=`pwd`/WXINSTALL/bin/wx-config
     50  WX_CONFIG=`pwd`/WXINSTALL/bin/wx-config
    5351fi
    5452
    55 test -n "$WXCONFIG" || WXCONFIG=`which wx-config`
    56 if test -z "$WXCONFIG" ; then
    57   echo "WXCONFIG not set and wx-config not on your PATH"
     53test -n "$WX_CONFIG" || WX_CONFIG=`which wx-config`
     54if test -z "$WX_CONFIG" ; then
     55  echo "WX_CONFIG not set and wx-config not on your PATH"
    5856  exit 1
    5957fi
    6058# Force static linking so the user doesn't need to install wxWidgets.
    61 WXCONFIG=$WXCONFIG' --static'
    62 export WXCONFIG
     59WX_CONFIG=$WX_CONFIG' --static'
    6360rm -rf *.dmg Survex macosxtmp
    6461D=`pwd`/Survex
    6562T=`pwd`/macosxtmp
    66 ./configure --prefix="$D" --bindir="$D" --mandir="$T"
     63./configure --prefix="$D" --bindir="$D" --mandir="$T" WX_CONFIG="$WX_CONFIG"
    6764make
    6865make install
Note: See TracChangeset for help on using the changeset viewer.