andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Various cleanups to get Xquartz to compile.

Browse Source
This commit is contained in:
Jeremy Huddleston 2007-11-20 06:59:11 -08:00
parent 89c4aa9d4a
commit 738a229a71
9 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GL/apple/Makefile.am
View File

@ -3,7 +3,9 @@ AM_CFLAGS = -I$(top_srcdir) \
-I$(top_srcdir)/GL/include \
-I$(top_srcdir)/GL/mesa/glapi \
-I$(top_srcdir)/hw/darwin/quartz \
-I$(top_srcdir)/hw/darwin/quartz/xpr
-I$(top_srcdir)/hw/darwin/quartz/xpr \
-I$(top_srcdir)/miext/damage \
$(PIXMAN_CFLAGS)
noinst_LIBRARIES = libCGLcore.a
libCGLcore_a_SOURCES = indirect.c \

17
configure.ac
View File

@ -70,13 +70,16 @@ AC_ARG_WITH(dtrace, AS_HELP_STRING([--with-dtrace=PATH],
[Enable dtrace probes (default: enabled if dtrace found)]),
[WDTRACE=$withval], [WDTRACE=auto])
if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then
AC_PATH_PROG(DTRACE, [dtrace], [not_found], [$PATH:/usr/sbin])
if test "x$DTRACE" = "xnot_found" ; then
if test "x$WDTRACE" = "xyes" ; then
AC_MSG_FAILURE([dtrace requested but not found])
fi
WDTRACE="no"
fi
case $host_os in
darwin*) WDTRACE="no" ;;
*) AC_PATH_PROG(DTRACE, [dtrace], [not_found], [$PATH:/usr/sbin])
if test "x$DTRACE" = "xnot_found" ; then
if test "x$WDTRACE" = "xyes" ; then
AC_MSG_FAILURE([dtrace requested but not found])
fi
WDTRACE="no"
fi ;;
esac
fi
if test "x$WDTRACE" != "xno" ; then
AC_DEFINE(XSERVER_DTRACE, 1,

13
hw/darwin/Makefile.am
View File

@ -1,5 +1,10 @@
AM_CFLAGS = @XORG_CFLAGS@
AM_CPPFLAGS = @XORG_INCS@ -I$(top_srcdir)/Xext -I$(top_srcdir)/miext/rootless -DUSE_NEW_CLUT -DBUILD_DATE=\"$(BUILD_DATE)\" -DHAVE_XORG_CONFIG_H -DXFree86Server -DINXQUARTZ
AM_CFLAGS = $(XORG_CFLAGS) $(PIXMAN_CFLAGS)
AM_CPPFLAGS = $(XORG_INCS) -DUSE_NEW_CLUT -DBUILD_DATE=\"$(BUILD_DATE)\" -DHAVE_XORG_CONFIG_H -DXFree86Server -DINXQUARTZ \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/rootless \
-I$(top_srcdir)/render \
-I$(top_srcdir)/Xext
SUBDIRS = quartz utils
@ -10,7 +15,7 @@ Xquartz_SOURCES = darwin.c \
darwinEvents.c \
darwinKeyboard.c \
darwinXinput.c \
$(top_srcdir)/fb/fbcmap.c \
$(top_srcdir)/fb/fbcmap_mi.c \
$(top_srcdir)/mi/miinitext.c
# We should probably add these once they're working, or are these obsolete and to be removed?
@ -41,7 +46,7 @@ Xquartz_LDADD = ./quartz/libXquartz.a \
$(top_builddir)/miext/rootless/librootless.la \
$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
$(top_builddir)/miext/rootless/accel/librlAccel.la \
$(DARWIN_LIBS) $(XSERVER_LIBS) -lXplugin
$(DARWIN_LIBS) $(XSERVER_LIBS) $(PIXMAN_LIBS) -lXplugin
Xquartz_LDFLAGS = -XCClinker -Objc \
-Wl,-u,_miDCInitialize \

10
hw/darwin/darwin.c
View File

@ -362,12 +362,10 @@ static int DarwinMouseProc(
map[3] = 3;
map[4] = 4;
map[5] = 5;
InitPointerDeviceStruct( (DevicePtr)pPointer,
map,
5, // numbuttons (4 & 5 are scroll wheel)
miPointerGetMotionEvents,
(PtrCtrlProcPtr)NoopDDA,
0 );
InitPointerDeviceStruct((DevicePtr)pPointer, map, 5,
GetMotionHistory,
(PtrCtrlProcPtr)NoopDDA,
GetMotionHistorySize(), 2);
#ifdef XINPUT
InitValuatorAxisStruct( pPointer,
0, // X axis

11
hw/darwin/quartz/Makefile.am
View File

@ -1,8 +1,13 @@
noinst_LIBRARIES = libXQuartz.a
AM_CFLAGS = @XORG_CFLAGS@
AM_OBJCFLAGS = @XORG_CFLAGS@
AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)/miext/rootless @XORG_INCS@ -DXBINDIR=\"${bindir}\" -DHAS_KL_API -DHAVE_XORG_CONFIG_H
AM_CFLAGS = $(XORG_CFLAGS) $(PIXMAN_CFLAGS)
AM_OBJCFLAGS = $(XORG_CFLAGS) $(PIXMAN_CFLAGS)
AM_CPPFLAGS = $(XORG_INCS) -DXBINDIR=\"${bindir}\" -DHAS_KL_API -DHAVE_XORG_CONFIG_H \
-I$(srcdir) -I$(srcdir)/.. \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/rootless \
-I$(top_srcdir)/render
SUBDIRS = cr fullscreen xpr

12
hw/darwin/quartz/cr/Makefile.am
View File

@ -1,13 +1,15 @@
noinst_LIBRARIES = libcr.a
AM_CFLAGS = @XORG_CFLAGS@
AM_OBJCFLAGS = @XORG_CFLAGS@
AM_CFLAGS = $(XORG_CFLAGS)
AM_OBJCFLAGS = $(XORG_CFLAGS)
AM_CPPFLAGS = -DDEFER_NSWINDOW \
@XORG_INCS@ \
$(XORG_INCS) \
-I../fullscreen \
-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/rootless \
-I$(top_srcdir)/miext/rootless/safeAlpha \
-I$(top_srcdir)/mi
-I$(top_srcdir)/render \
$(PIXMAN_CFLAGS)
libcr_a_SOURCES = crAppleWM.m \
crFrame.m \
@ -18,4 +20,4 @@ libcr_a_SOURCES = crAppleWM.m \
EXTRA_DIST = \
cr.h \
XView.h

7
hw/darwin/quartz/fullscreen/Makefile.am
View File

@ -1,6 +1,9 @@
noinst_LIBRARIES = libfullscreen.a
AM_CFLAGS = @XORG_CFLAGS@
AM_CPPFLAGS = @XORG_INCS@ -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../..
AM_CFLAGS = $(XORG_CFLAGS) $(PIXMAN_CFLAGS)
AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
-I$(top_srcdir)/miext/damage \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/mi
libfullscreen_a_SOURCES = fullscreen.c \
quartzCursor.c

2
hw/darwin/quartz/quartzCocoa.m
View File

@ -97,7 +97,7 @@ char *QuartzReadCocoaPasteboard(void)
char *buffer;
if (! string) return NULL;
buffer = (char *) [string lossyCString];
buffer = (char *) [string UTF8String];
text = (char *) malloc(strlen(buffer)+1);
if (text)
strcpy(text, buffer);

10
hw/darwin/quartz/xpr/Makefile.am
View File

@ -1,11 +1,15 @@
noinst_LIBRARIES = libxpr.a
AM_CFLAGS = @XORG_CFLAGS@
AM_CPPFLAGS = @XORG_INCS@ \
AM_CFLAGS = $(XORG_CFLAGS) $(PIXMAN_CFLAGS)
AM_CPPFLAGS = $(XORG_INCS) \
-DHAVE_XORG_CONFIG_H \
-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext \
-I$(top_srcdir)/miext/damage \
-I$(top_srcdir)/miext/rootless \
-I$(top_srcdir)/miext/rootless/safeAlpha \
-I$(top_srcdir)/miext
-I$(top_srcdir)/render
libxpr_a_SOURCES = \
appledri.c \