[PATCH 2/5] Only build the quartzdrv on Mac OS X and add an option
to disable it in configure.
Pierre d'Herbemont
pdherbemont at free.fr
Fri Oct 20 14:47:18 CDT 2006
---
configure.ac | 12 ++++++++++++
dlls/make_dlls | 3 ++-
2 files changed, 14 insertions(+), 1 deletions(-)
-------------- next part --------------
diff --git a/configure.ac b/configure.ac
index 8fafa83..5e5d1ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,12 @@ AC_ARG_WITH(opengl, AC_HELP_STRING([-
AC_ARG_WITH(curses, AC_HELP_STRING([--without-curses],[do not use curses]))
AC_ARG_WITH(wine-tools,AC_HELP_STRING([--with-wine-tools=<dir>],[use Wine tools from directory <dir>]))
+case $host_os in
+ darwin*|macosx*)
+ AC_ARG_ENABLE(quartz, AC_HELP_STRING([--disable-quartz], [do not build the quartz video driver on Mac OS X]))
+ ;;
+esac
+
AC_CANONICAL_HOST
case $host in
x86_64*linux*)
@@ -146,6 +152,7 @@ AC_SUBST(XFILES,"")
AC_SUBST(OPENGLFILES,"")
AC_SUBST(GLU32FILES,"")
AC_SUBST(OPENGL_LIBS,"")
+AC_SUBST(QUARTZFILES,"")
dnl **** Check for header files ****
@@ -1017,6 +1024,11 @@ case $host_os in
LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" dnl FIXME
;;
esac
+ dnl Enable quartz driver on Mac OS X
+ if test "x$enable_quartz" != "xno"
+ then
+ QUARTZFILES='$(QUARTZFILES)'
+ fi
;;
*)
DLLFLAGS="$DLLFLAGS -fPIC"
diff --git a/dlls/make_dlls b/dlls/make_dlls
index f85fd89..7969c52 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -35,7 +35,8 @@ (
"glut32" => "GLUT32FILES",
"opengl32" => "OPENGLFILES",
"wined3d" => "OPENGLFILES",
- "winex11.drv" => "XFILES"
+ "winex11.drv" => "XFILES",
+ "winequartz.drv" => "QUARTZFILES"
);
sub needs_symlink($)
More information about the wine-patches
mailing list