[vlc-commits] contrib: update qt4 for OSX (doesn't build)

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Nov 23 00:57:42 2011 -0500| [e270cf4d9d69196f303e0218d435b00584afb07c] | committer: Rafaël Carré

contrib: update qt4 for OSX (doesn't build)

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

 contrib/src/qt4/rules.mak |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak
index 64ff038..892b45d 100644
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -3,7 +3,9 @@
 QT4_VERSION = 4.7.4
 QT4_URL := http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-$(QT4_VERSION).tar.gz
 
-# FIXME : OSX build
+ifdef HAVE_MACOSX
+#PKGS += qt4
+endif
 ifdef HAVE_WIN32
 PKGS += qt4
 endif
@@ -27,8 +29,15 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
 
 XTOOLS := XCC="$(CC)" XCXX="$(CXX)" XSTRIP="$(STRIP)" XAR="$(AR)"
 
+ifdef HAVE_MACOSX
+PLATFORM := -platform darwin-g++
+endif
+ifdef HAVE_WIN32
+PLATFORM := -xplatform win32-g++
+endif
+
 .qt4: qt4
-	cd $< && $(XTOOLS) ./configure -xplatform win32-g++ -static -release -fast -no-exceptions -no-stl -no-sql-sqlite -no-qt3support -no-gif -no-libmng -qt-libjpeg -no-libtiff -no-qdbus -no-openssl -no-webkit -sse -no-script -no-multimedia -no-phonon -opensource -no-scripttools -no-opengl -no-script -no-scripttools -no-declarative -no-declarative-debug -opensource -no-s60 -host-little-endian -confirm-license
+	cd $< && $(XTOOLS) ./configure $(PLATFORM) -static -release -fast -no-exceptions -no-stl -no-sql-sqlite -no-qt3support -no-gif -no-libmng -qt-libjpeg -no-libtiff -no-qdbus -no-openssl -no-webkit -sse -no-script -no-multimedia -no-phonon -opensource -no-scripttools -no-opengl -no-script -no-scripttools -no-declarative -no-declarative-debug -opensource -no-s60 -host-little-endian -confirm-license
 	cd $< && $(MAKE) $(XTOOLS) sub-src
 	# BUILDING QT BUILD TOOLS
 ifdef HAVE_CROSS_COMPILE