Merge remote-tracking branch 'jeremyhu/master'
This commit is contained in:
commit
a239e6faf3
59
configure.ac
59
configure.ac
|
@ -814,7 +814,7 @@ LIBAPPLEWM="applewm >= 1.4"
|
|||
LIBDMX="dmx >= 1.0.99.1"
|
||||
LIBDRI="dri >= 7.8.0"
|
||||
LIBDRM="libdrm >= 2.3.0"
|
||||
LIBGL="gl >= 9.2.0"
|
||||
LIBGL="gl >= 7.1.0"
|
||||
LIBXEXT="xext >= 1.0.99.4"
|
||||
LIBXFONT="xfont >= 1.4.2"
|
||||
LIBXI="xi >= 1.2.99.1"
|
||||
|
@ -1069,34 +1069,6 @@ fi
|
|||
AC_MSG_RESULT([$CLIENTIDS])
|
||||
AM_CONDITIONAL(CLIENTIDS, [test "x$CLIENTIDS" = xyes])
|
||||
|
||||
if test "x$GLX" = xyes; then
|
||||
PKG_CHECK_MODULES([XLIB], [x11])
|
||||
PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL)
|
||||
AC_SUBST(XLIB_CFLAGS)
|
||||
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
|
||||
GLX_LIBS='$(top_builddir)/glx/libglx.la'
|
||||
GLX_SYS_LIBS="$GLX_SYS_LIBS $GL_LIBS"
|
||||
else
|
||||
GLX=no
|
||||
fi
|
||||
AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
|
||||
|
||||
if test "x$GLX" = xno; then
|
||||
AIGLX=no
|
||||
fi
|
||||
|
||||
if test "x$AIGLX" = xyes -a \( "x$DRI2" = xyes \); then
|
||||
AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
|
||||
fi
|
||||
AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes)
|
||||
|
||||
if test "x$GLX_USE_TLS" = xyes ; then
|
||||
GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
|
||||
GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"
|
||||
fi
|
||||
AC_SUBST([GLX_DEFINES])
|
||||
AC_SUBST([GLX_SYS_LIBS])
|
||||
|
||||
AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
|
||||
if test "x$DRI" = xyes; then
|
||||
AC_DEFINE(XF86DRI, 1, [Build DRI extension])
|
||||
|
@ -1113,6 +1085,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in
|
|||
yes,yes | auto,yes)
|
||||
AC_DEFINE(DRI2, 1, [Build DRI2 extension])
|
||||
DRI2=yes
|
||||
LIBGL="gl >= 9.2.0"
|
||||
SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
|
||||
;;
|
||||
esac
|
||||
|
@ -1258,6 +1231,34 @@ if test "x$DRI2" = xyes; then
|
|||
fi
|
||||
AM_CONDITIONAL(DRI2_AIGLX, test "x$DRI2_AIGLX" = xyes)
|
||||
|
||||
if test "x$GLX" = xyes; then
|
||||
PKG_CHECK_MODULES([XLIB], [x11])
|
||||
PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL)
|
||||
AC_SUBST(XLIB_CFLAGS)
|
||||
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
|
||||
GLX_LIBS='$(top_builddir)/glx/libglx.la'
|
||||
GLX_SYS_LIBS="$GLX_SYS_LIBS $GL_LIBS"
|
||||
else
|
||||
GLX=no
|
||||
fi
|
||||
AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
|
||||
|
||||
if test "x$GLX" = xno; then
|
||||
AIGLX=no
|
||||
fi
|
||||
|
||||
if test "x$AIGLX" = xyes -a \( "x$DRI2" = xyes \); then
|
||||
AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
|
||||
fi
|
||||
AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes)
|
||||
|
||||
if test "x$GLX_USE_TLS" = xyes ; then
|
||||
GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
|
||||
GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"
|
||||
fi
|
||||
AC_SUBST([GLX_DEFINES])
|
||||
AC_SUBST([GLX_SYS_LIBS])
|
||||
|
||||
AM_CONDITIONAL(PRESENT, [test "x$PRESENT" = xyes])
|
||||
if test "x$PRESENT" = xyes; then
|
||||
AC_DEFINE(PRESENT, 1, [Support Present extension])
|
||||
|
|
|
@ -936,7 +936,7 @@ extern char *bundle_id_prefix;
|
|||
|
||||
- (void) applicationWillTerminate:(NSNotification *)aNotification
|
||||
{
|
||||
unsigned remain;
|
||||
int remain;
|
||||
[X11App prefs_synchronize];
|
||||
|
||||
/* shutdown the X server, it will exit () for us. */
|
||||
|
|
|
@ -39,9 +39,9 @@
|
|||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.utilities</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>© 2003-2012 Apple Inc.
|
||||
<string>© 2003-2013 Apple Inc.
|
||||
© 2003 XFree86 Project, Inc.
|
||||
© 2003-2012 X.org Foundation, Inc.
|
||||
© 2003-2013 X.org Foundation, Inc.
|
||||
</string>
|
||||
<key>NSMainNibFile</key>
|
||||
<string>main</string>
|
||||
|
|
Loading…
Reference in New Issue
Block a user