[vlc-devel] commit: contrib: extra distro file for Darwin 64, which removes default compilation of libsdl, sdl_image and goom2k4, as these aren't 64bit compatible ( Felix Paul Kühne )

[git version control]

vlc | branch: 1.0-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Mon Aug 31 01:26:54 2009 +0200| [22d015cb1904ba6f327ef3a66d8e32a556868438] | committer: Felix Paul Kühne 

contrib: extra distro file for Darwin 64, which removes default compilation of libsdl, sdl_image and goom2k4, as these aren't 64bit compatible

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=22d015cb1904ba6f327ef3a66d8e32a556868438
---

 extras/contrib/bootstrap |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 8eda06f..c043e3a 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -234,13 +234,6 @@ case $HOST in
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
         DISTRO=wince
     ;;
-<<<<<<< HEAD
-    *mingw32*)
-        echo "HAVE_WIN32 = 1" >> config.mak
-        echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
-	    EXTRA_CFLAGS="-O3"
-        cat src/Distributions/win32.mak >> distro.mak
-=======
     x86_64-*-mingw*)
         echo "HAVE_WIN64 = 1" >> config.mak
         echo "HAVE_WIN32 = 1" >> config.mak
@@ -253,7 +246,6 @@ case $HOST in
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
         EXTRA_CFLAGS="-O3"
         DISTRO=win32
->>>>>>> c1bc979... contribs: fix DISTRO specification
     ;;
     i686-pc-cygwin)
         echo "HAVE_WIN32 = 1" >> config.mak