iokit support for XDarwin
This commit is contained in:
parent
3ead1afe78
commit
136bb4874a
17
hw/darwin/iokit/Makefile.am
Normal file
17
hw/darwin/iokit/Makefile.am
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
noinst_LIBRARIES = libiokit.a
|
||||||
|
|
||||||
|
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
|
||||||
|
INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. @XORG_INCS@
|
||||||
|
AM_DEFS =
|
||||||
|
if XQUARTZ
|
||||||
|
AM_DEFS += -DDARWIN_WITH_QUARTZ -DXFree86Server
|
||||||
|
XQUARTZ_SUBDIRS = bundle quartz
|
||||||
|
endif
|
||||||
|
DEFS = @DEFS@ $(AM_DEFS)
|
||||||
|
|
||||||
|
libiokit_a_SOURCES = xfIOKit.c \
|
||||||
|
xfIOKitCursor.c \
|
||||||
|
xfIOKitStartup.c
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
xfIOKit.h
|
|
@ -34,6 +34,10 @@
|
||||||
* use or other dealings in this Software without prior written authorization.
|
* use or other dealings in this Software without prior written authorization.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#if HAVE_XORG_CONFIG_H
|
||||||
|
#include <xorg-config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <X11/X.h>
|
#include <X11/X.h>
|
||||||
#include <X11/Xproto.h>
|
#include <X11/Xproto.h>
|
||||||
#include "os.h"
|
#include "os.h"
|
||||||
|
@ -51,6 +55,7 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
#include <mach/mach_interface.h>
|
#include <mach/mach_interface.h>
|
||||||
|
|
||||||
|
|
|
@ -58,6 +58,9 @@
|
||||||
* use or other dealings in this Software without prior written authorization.
|
* use or other dealings in this Software without prior written authorization.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#if HAVE_XORG_CONFIG_H
|
||||||
|
#include <xorg-config.h>
|
||||||
|
#endif
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
#include "cursorstr.h"
|
#include "cursorstr.h"
|
||||||
#include "mipointrst.h"
|
#include "mipointrst.h"
|
||||||
|
@ -67,7 +70,7 @@
|
||||||
#include <IOKit/hidsystem/IOHIDLib.h>
|
#include <IOKit/hidsystem/IOHIDLib.h>
|
||||||
#include "darwin.h"
|
#include "darwin.h"
|
||||||
#include "xfIOKit.h"
|
#include "xfIOKit.h"
|
||||||
|
#include <assert.h>
|
||||||
#define DUMP_DARWIN_CURSOR FALSE
|
#define DUMP_DARWIN_CURSOR FALSE
|
||||||
|
|
||||||
#define CURSOR_PRIV(pScreen) \
|
#define CURSOR_PRIV(pScreen) \
|
||||||
|
|
|
@ -29,6 +29,11 @@
|
||||||
* use or other dealings in this Software without prior written authorization.
|
* use or other dealings in this Software without prior written authorization.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#if HAVE_XORG_CONFIG_H
|
||||||
|
#include <xorg-config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "darwin.h"
|
#include "darwin.h"
|
||||||
#include "darwinKeyboard.h"
|
#include "darwinKeyboard.h"
|
||||||
#include "micmap.h"
|
#include "micmap.h"
|
||||||
|
@ -57,7 +62,9 @@ void DarwinHandleGUI(
|
||||||
*/
|
*/
|
||||||
void DarwinGlxExtensionInit(void)
|
void DarwinGlxExtensionInit(void)
|
||||||
{
|
{
|
||||||
GlxExtensionInit();
|
#ifdef GLXEXT
|
||||||
|
GlxExtensionInit();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -67,7 +74,9 @@ void DarwinGlxExtensionInit(void)
|
||||||
void DarwinGlxWrapInitVisuals(
|
void DarwinGlxWrapInitVisuals(
|
||||||
miInitVisualsProcPtr *procPtr)
|
miInitVisualsProcPtr *procPtr)
|
||||||
{
|
{
|
||||||
|
#ifdef GLXEXT
|
||||||
GlxWrapInitVisuals(procPtr);
|
GlxWrapInitVisuals(procPtr);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user