]> git.sesse.net Git - vlc/commit
Revert "contrib: Build fat binary using binary contrib on Mac OS X."
authorRafaël Carré <rafael.carre@gmail.com>
Mon, 4 Jan 2010 12:30:13 +0000 (13:30 +0100)
committerRafaël Carré <rafael.carre@gmail.com>
Mon, 4 Jan 2010 12:34:43 +0000 (13:34 +0100)
commitd4748057ae5b5e865a46ae4591d34dee43013e6a
treeacb3e139bb4b6e292ac1306155cdcb5acf315051
parentca5e15a954a187ac922ce27d489187afbc36631e
Revert "contrib: Build fat binary using binary contrib on Mac OS X."

This reverts commit 2e024847e1bbfad3ddf4aa9fcb01c90c0e41c854.

Conflicts:

extras/contrib/Makefile

We can't use a fat set of contribs, because the headers do differ
between 32bits & 64 bits builds

example:

../x86_64-apple-darwin10/include/freetype2/freetype/config/ftconfig.h
2010-01-04 12:49:02.000000000 +0100
+++ ../i686-apple-darwin10/include/freetype2/freetype/config/ftconfig.h
2010-01-04 12:47:12.000000000 +0100
@@ -80,7 +80,7 @@
 #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES

   #define SIZEOF_INT 4
   -#define SIZEOF_LONG 8
   +#define SIZEOF_LONG 4

Moreover the pkgconfig & *-config files still referenced the x86_64
directory
extras/contrib/Makefile