diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
| commit | d79e641dea89c0d5d651b11971c4c9e14df34629 (patch) | |
| tree | 59d636ef9c4c21906ea28ac719589f25b9794d0a /xorg-server/hw/xquartz | |
| parent | bf59764a4685c4bef029eddfa75d7496d2a91ae0 (diff) | |
| parent | c6f80401dc533b04341afe8d596960d1bc25efce (diff) | |
| download | vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.gz vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.bz2 vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/log.c
Diffstat (limited to 'xorg-server/hw/xquartz')
| -rw-r--r-- | xorg-server/hw/xquartz/darwin.c | 6 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/mach-startup/Makefile.am | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c index 2e0bfe6da..03030ad22 100644 --- a/xorg-server/hw/xquartz/darwin.c +++ b/xorg-server/hw/xquartz/darwin.c @@ -541,15 +541,15 @@ InitInput(int argc, char **argv) gdkdev->info.source = GDK_SOURCE_PEN; */ - darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, FALSE); + darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE); assert(darwinTabletStylus); darwinTabletStylus->name = strdup("pen"); - darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, FALSE); + darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE); assert(darwinTabletCursor); darwinTabletCursor->name = strdup("cursor"); - darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, FALSE); + darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE); assert(darwinTabletEraser); darwinTabletEraser->name = strdup("eraser"); diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.am b/xorg-server/hw/xquartz/mach-startup/Makefile.am index 21ad5b503..77962b14d 100644 --- a/xorg-server/hw/xquartz/mach-startup/Makefile.am +++ b/xorg-server/hw/xquartz/mach-startup/Makefile.am @@ -23,7 +23,7 @@ nodist_X11_bin_SOURCES = \ mach_startupServer.c \ mach_startupUser.c -X11_bin_LDADD = \ +X11_bin_DEPENDENCIES = \ $(top_builddir)/hw/xquartz/libXquartz.la \ $(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \ $(top_builddir)/dix/dixfonts.lo \ @@ -31,8 +31,12 @@ X11_bin_LDADD = \ $(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \ $(XQUARTZ_LIBS) $(XSERVER_LIBS) +# $(XSERVER_SYS_LIBS) is placed here in order to set command line ordering +# to work around build issues on Tiger. +X11_bin_LDADD = $(X11_bin_DEPENDENCIES) $(XSERVER_SYS_LIBS) + X11_bin_LDFLAGS = \ - $(XSERVER_SYS_LIBS) -lXplugin \ + -lXplugin \ -XCClinker -Objc \ -Wl,-u,_miDCInitialize \ -Wl,-framework,Carbon \ @@ -41,7 +45,7 @@ X11_bin_LDFLAGS = \ -Wl,-framework,IOKit if GLX -X11_bin_LDADD += \ +X11_bin_DEPENDENCIES += \ $(top_builddir)/hw/xquartz/GL/libCGLCore.la \ $(top_builddir)/glx/libglx.la @@ -55,12 +59,10 @@ X11_bin_LDFLAGS += \ endif if RECORD -X11_bin_LDADD += \ +X11_bin_DEPENDENCIES += \ $(top_builddir)/record/librecord.la endif -X11_bin_DEPENDENCIES = $(X11_bin_LDADD) - bin_PROGRAMS = Xquartz dist_Xquartz_SOURCES = \ |