diff options
| author | jstebbins <[email protected]> | 2009-09-02 16:53:07 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-09-02 16:53:07 +0000 |
| commit | b75907bdeb3675bdd8d9362e0e18add00e4e2c62 (patch) | |
| tree | e817a3168abba243f6822d04b111441badd2f246 | |
| parent | fcaf0013ed3fe61bdbec8de9a8f1312775779999 (diff) | |
build system: fix 32 bit build on Snow Leopard
gcc-4.2 on SL reports i686 (but generates x86_64 code by default)
and uname -m reports i386 (unless you hold 6+4 keys while booting)
so modify configure.py to always add '-arch xxx' option on os x
Also, update libtheora to svn 16547 since the 1.0 release doesn't compile
on SL.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2800 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/libtheora/module.defs | 2 | ||||
| -rw-r--r-- | make/configure.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libtheora/module.defs b/contrib/libtheora/module.defs index 6505c8b64..edc0c002c 100644 --- a/contrib/libtheora/module.defs +++ b/contrib/libtheora/module.defs @@ -1,7 +1,7 @@ $(eval $(call import.MODULE.defs,LIBTHEORA,libtheora,LIBOGG LIBVORBIS)) $(eval $(call import.CONTRIB.defs,LIBTHEORA)) -LIBTHEORA.FETCH.url = http://download.m0k.org/handbrake/contrib/libtheora-1.0.tar.gz +LIBTHEORA.FETCH.url = http://download.m0k.org/handbrake/contrib/libtheora-svn16547.tar.gz LIBTHEORA.EXTRACT.tarbase = libtheora LIBTHEORA.CONFIGURE.extra = \ diff --git a/make/configure.py b/make/configure.py index 1b140739b..4b98b9bf3 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1299,7 +1299,7 @@ try: select.doc_add( doc ) doc.addBlank() - if arch.mode.mode != arch.mode.default: + if build.match( '*-*-darwin*' ): doc.add( 'GCC.archs', arch.mode.mode ) else: doc.add( 'GCC.archs', '' ) |