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

Moved Apple GL bits into our DDX subtree

Browse Source 
(cherry picked from commit c9356f3289)
(cherry picked from commit d09c520b32)
This commit is contained in:
Jeremy Huddleston 2008-04-23 10:22:34 -07:00 committed by Adam Jackson
parent 500463f728
commit d88da6638e
5 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
GL/Makefile.am
View File

@ -1,9 +1,4 @@
if XQUARTZ SUBDIRS = glx
XQUARTZ_SUBDIRS = apple
endif
SUBDIRS = glx $(XQUARTZ_SUBDIRS)
DIST_SUBDIRS = glx apple
WINDOWS_EXTRAS = \ WINDOWS_EXTRAS = \
windows/ChangeLog \ windows/ChangeLog \

20
configure.ac
View File

@ -1740,22 +1740,14 @@ fi
if test "x$XQUARTZ" = xyes; then if test "x$XQUARTZ" = xyes; then
AC_DEFINE([XQUARTZ],[1],[Have Quartz]) AC_DEFINE([XQUARTZ],[1],[Have Quartz])
#glxAGL / glxCGL don't work yet DARWIN_GLX_LIBS='$(top_builddir)/hw/xquartz/GL/libCGLCore.la $(top_builddir)/GL/glx/libglx.la'
# AC_CACHE_CHECK([for AGL framework],xorg_cv_AGL_framework,[ DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $DARWIN_GLX_LIBS"
# save_LDFLAGS=$LDFLAGS
# LDFLAGS="$LDFLAGS -framework AGL"
# AC_LINK_IFELSE(
# [char aglEnable(); int main() { aglEnable(); return 0;}],
# [xorg_cv_AGL_framework=yes],
# [xorg_cv_AGL_framework=no])
# LDFLAGS=$save_LDFLAGS
# ])
xorg_cv_AGL_framework=no
DARWIN_GLX_LIBS='$(top_builddir)/GL/apple/indirect.o $(top_builddir)/GL/glx/libglx.la'
DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DARWIN_GLX_LIBS"
AC_SUBST([DARWIN_LIBS]) AC_SUBST([DARWIN_LIBS])
AC_CHECK_LIB([Xplugin],[xp_init],[:]) AC_CHECK_LIB([Xplugin],[xp_init],[:])
CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA" CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA"
if test "x$XF86MISC" = xyes || test "x$XF86MISC" = xauto; then if test "x$XF86MISC" = xyes || test "x$XF86MISC" = xauto; then
AC_MSG_NOTICE([Disabling XF86Misc extension]) AC_MSG_NOTICE([Disabling XF86Misc extension])
XF86MISC=no XF86MISC=no
@ -2112,7 +2104,6 @@ XORG_MANPAGE_SECTIONS
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
GL/Makefile GL/Makefile
GL/apple/Makefile
GL/glx/Makefile GL/glx/Makefile
include/Makefile include/Makefile
afb/Makefile afb/Makefile
@ -2211,6 +2202,7 @@ hw/xgl/glxext/module/Makefile
hw/xnest/Makefile hw/xnest/Makefile
hw/xwin/Makefile hw/xwin/Makefile
hw/xquartz/Makefile hw/xquartz/Makefile
hw/xquartz/GL/Makefile
hw/xquartz/bundle/Makefile hw/xquartz/bundle/Makefile
hw/xquartz/xpr/Makefile hw/xquartz/xpr/Makefile
hw/kdrive/Makefile hw/kdrive/Makefile

9
GL/apple/Makefile.am → hw/xquartz/GL/Makefile.am
View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(DIX_CFLAGS) noinst_LTLIBRARIES = libCGLCore.la
AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/GL/glx \ -I$(top_srcdir)/GL/glx \
@ -8,7 +9,5 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/hw/xquartz/xpr \ -I$(top_srcdir)/hw/xquartz/xpr \
-I$(top_srcdir)/miext/damage -I$(top_srcdir)/miext/damage
noinst_LIBRARIES = libCGLcore.a libCGLCore_la_SOURCES = \
libCGLcore_a_SOURCES = \ indirect.c
indirect.c \
$(top_srcdir)/hw/dmx/glxProxy/compsize.c

0
GL/apple/indirect.c → hw/xquartz/GL/indirect.c
View File

4
hw/xquartz/Makefile.am
View File

@ -13,8 +13,8 @@ if X11APP
X11APP_SUBDIRS = bundle X11APP_SUBDIRS = bundle
endif endif
SUBDIRS = . xpr $(X11APP_SUBDIRS) SUBDIRS = . GL xpr $(X11APP_SUBDIRS)
DIST_SUBDIRS = xpr bundle DIST_SUBDIRS = GL xpr bundle
libXquartz_la_SOURCES = \ libXquartz_la_SOURCES = \
$(top_srcdir)/fb/fbcmap_mi.c \ $(top_srcdir)/fb/fbcmap_mi.c \