quartzdrv: Add the quartz (Mac OS X) video driver to the build system.

Makefile.in

@@ -383,6 +383,7 @@ ALL_MAKEFILES = \
 	dlls/winedos/Makefile \
 	dlls/winemp3.acm/Makefile \
 	dlls/wineps.drv/Makefile \
+	dlls/winequartz.drv/Makefile \
 	dlls/winex11.drv/Makefile \
 	dlls/wininet/Makefile \
 	dlls/wininet/tests/Makefile \
@@ -705,6 +706,7 @@ dlls/wined3d/Makefile: dlls/wined3d/Makefile.in dlls/Makedll.rules
 dlls/winedos/Makefile: dlls/winedos/Makefile.in dlls/Makedll.rules
 dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
 dlls/wineps.drv/Makefile: dlls/wineps.drv/Makefile.in dlls/Makedll.rules
+dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules
 dlls/winex11.drv/Makefile: dlls/winex11.drv/Makefile.in dlls/Makedll.rules
 dlls/wininet/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules
 dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules

configure.ac

@@ -146,11 +146,13 @@ AC_SUBST(XFILES,"")
 AC_SUBST(OPENGLFILES,"")
 AC_SUBST(GLU32FILES,"")
 AC_SUBST(OPENGL_LIBS,"")
+AC_SUBST(QUARTZFILES,"")
 
 dnl **** Check for header files ****
 
 AC_CHECK_HEADERS(\
 	AudioUnit/AudioUnit.h \
+	Carbon/Carbon.h \
 	CoreAudio/CoreAudio.h \
 	IOKit/IOKitLib.h \
 	alsa/asoundlib.h \
@@ -1026,6 +1028,11 @@ case $host_os in
         LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning"  dnl FIXME
         ;;
     esac
+    dnl Enable quartz driver on Mac OS X
+    if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
+    then
+        QUARTZFILES='$(QUARTZFILES)'
+    fi
     ;;
   *)
     DLLFLAGS="$DLLFLAGS -fPIC"
@@ -1738,6 +1745,7 @@ dlls/wined3d/Makefile
 dlls/winedos/Makefile
 dlls/winemp3.acm/Makefile
 dlls/wineps.drv/Makefile
+dlls/winequartz.drv/Makefile
 dlls/winex11.drv/Makefile
 dlls/wininet/Makefile
 dlls/wininet/tests/Makefile

dlls/Makefile.in

@@ -10,8 +10,9 @@ VPATH     = @srcdir@
 GLU32FILES = glu32
 GLUT32FILES = glut32
 OPENGLFILES = opengl32 wined3d
+QUARTZFILES = winequartz.drv
 XFILES = winex11.drv
-EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@
+EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @QUARTZFILES@ @XFILES@
 
 # Subdir list
 
@@ -277,6 +278,7 @@ SUBDIRS = \
 	glut32 \
 	opengl32 \
 	wined3d \
+	winequartz.drv \
 	winex11.drv
 
 BUILDSUBDIRS   = $(BASEDIRS) $(EXTRADIRS) $(TESTSUBDIRS)

dlls/make_dlls

@@ -35,7 +35,8 @@ my %special_dlls =
   "glut32"   => "GLUT32FILES",
   "opengl32" => "OPENGLFILES",
   "wined3d"  => "OPENGLFILES",
-  "winex11.drv" => "XFILES"
+  "winex11.drv" => "XFILES",
+  "winequartz.drv" => "QUARTZFILES"
 );
 
 sub needs_symlink($)

dlls/winequartz.drv/Makefile.in

@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = winequartz.drv
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+
+C_SRCS = \
+	quartzdrv_main.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/winequartz.drv/quartzdrv_main.c

@@ -0,0 +1,49 @@
+/*
+ * QUARTZDRV initialization code
+ *
+ * Copyright 1998 Patrik Stridvall
+ * Copyright 2000 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+#include "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+
+/***********************************************************************
+ *           QUARTZDRV initialisation routine
+ */
+BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
+{
+    BOOL ret = TRUE;
+
+    switch(reason)
+    {
+    case DLL_PROCESS_ATTACH:
+        /* Do attach */
+        break;
+    case DLL_THREAD_DETACH:
+        /* do thread detach */
+        break;
+    case DLL_PROCESS_DETACH:
+        /* do detach */
+        break;
+    }
+    return ret;
+}

dlls/winequartz.drv/winequartz.drv.spec

@@ -0,0 +1 @@
+# Nothing Yet

include/config.h.in

@@ -41,6 +41,9 @@
 /* Define if you have capi4linux libs and headers */
 #undef HAVE_CAPI4LINUX
 
+/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
+#undef HAVE_CARBON_CARBON_H
+
 /* Define to 1 if you have the `chsize' function. */
 #undef HAVE_CHSIZE