Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
7b285a4e
Commit
7b285a4e
authored
Sep 19, 2009
by
André Hentschel
Committed by
Alexandre Julliard
Sep 22, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11: Add alternative header for xf86vm.
parent
681b08b0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
6 deletions
+14
-6
configure
configure
+4
-3
configure.ac
configure.ac
+4
-3
xvidmode.c
dlls/winex11.drv/xvidmode.c
+3
-0
config.h.in
include/config.h.in
+3
-0
No files found.
configure
View file @
7b285a4e
...
@@ -2724,7 +2724,7 @@ fi
...
@@ -2724,7 +2724,7 @@ fi
# Check whether --with-xxf86vm was given.
# Check whether --with-xxf86vm was given.
if
test
"
${
with_xxf86vm
+set
}
"
=
set
;
then
:
if
test
"
${
with_xxf86vm
+set
}
"
=
set
;
then
:
withval
=
$with_xxf86vm
;
if
test
"x
$withval
"
=
"xno"
;
then
ac_cv_header_X11_extensions_xf86vmode_h
=
no
;
fi
withval
=
$with_xxf86vm
;
if
test
"x
$withval
"
=
"xno"
;
then
ac_cv_header_X11_extensions_xf86vmode_h
=
no
;
ac_cv_header_X11_extensions_xf86vmproto_h
=
no
;
fi
fi
fi
...
@@ -8024,7 +8024,8 @@ fi
...
@@ -8024,7 +8024,8 @@ fi
X11/extensions/Xinerama.h
\
X11/extensions/Xinerama.h
\
X11/extensions/Xrandr.h
\
X11/extensions/Xrandr.h
\
X11/extensions/Xrender.h
\
X11/extensions/Xrender.h
\
X11/extensions/xf86vmode.h
X11/extensions/xf86vmode.h
\
X11/extensions/xf86vmproto.h
do
:
do
:
as_ac_Header
=
`
$as_echo
"ac_cv_header_
$ac_header
"
|
$as_tr_sh
`
as_ac_Header
=
`
$as_echo
"ac_cv_header_
$ac_header
"
|
$as_tr_sh
`
ac_fn_c_check_header_compile
"
$LINENO
"
"
$ac_header
"
"
$as_ac_Header
"
"#ifdef HAVE_X11_XLIB_H
ac_fn_c_check_header_compile
"
$LINENO
"
"
$ac_header
"
"
$as_ac_Header
"
"#ifdef HAVE_X11_XLIB_H
...
@@ -8323,7 +8324,7 @@ This is an error since --with-xshape was requested." "$LINENO" 5 ;;
...
@@ -8323,7 +8324,7 @@ This is an error since --with-xshape was requested." "$LINENO" 5 ;;
esac
esac
fi
fi
if
test
"
$ac_cv_header_X11_extensions_xf86vmode_h
"
=
"yes"
if
test
"
$ac_cv_header_X11_extensions_xf86vmode_h
"
=
"yes"
-o
"
$ac_cv_header_X11_extensions_xf86vmproto_h
"
=
"yes"
then
then
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for -lXxf86vm"
>
&5
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for -lXxf86vm"
>
&5
$as_echo_n
"checking for -lXxf86vm... "
>
&6
;
}
$as_echo_n
"checking for -lXxf86vm... "
>
&6
;
}
...
...
configure.ac
View file @
7b285a4e
...
@@ -84,7 +84,7 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared
...
@@ -84,7 +84,7 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi])
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi])
AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT]))
AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT]))
AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]),
AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi])
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no;
ac_cv_header_X11_extensions_xf86vmproto_h=no;
fi])
AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build]))
AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build]))
...
@@ -810,7 +810,8 @@ then
...
@@ -810,7 +810,8 @@ then
X11/extensions/Xinerama.h \
X11/extensions/Xinerama.h \
X11/extensions/Xrandr.h \
X11/extensions/Xrandr.h \
X11/extensions/Xrender.h \
X11/extensions/Xrender.h \
X11/extensions/xf86vmode.h],,,
X11/extensions/xf86vmode.h \
X11/extensions/xf86vmproto.h],,,
[#ifdef HAVE_X11_XLIB_H
[#ifdef HAVE_X11_XLIB_H
# include <X11/Xlib.h>
# include <X11/Xlib.h>
#endif
#endif
...
@@ -863,7 +864,7 @@ then
...
@@ -863,7 +864,7 @@ then
[XShape ${notice_platform}development files not found, XShape won't be supported.])
[XShape ${notice_platform}development files not found, XShape won't be supported.])
dnl *** Check for XFree86 VMODE extension
dnl *** Check for XFree86 VMODE extension
if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
-o "$ac_cv_header_X11_extensions_xf86vmproto_h" = "yes"
then
then
WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
fi
fi
...
...
dlls/winex11.drv/xvidmode.c
View file @
7b285a4e
...
@@ -30,6 +30,9 @@
...
@@ -30,6 +30,9 @@
#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
#include <X11/extensions/xf86vmode.h>
#include <X11/extensions/xf86vmode.h>
#endif
#endif
#ifdef HAVE_X11_EXTENSIONS_XF86VMPROTO_H
#include <X11/extensions/xf86vmproto.h>
#endif
#include "xvidmode.h"
#include "xvidmode.h"
...
...
include/config.h.in
View file @
7b285a4e
...
@@ -1029,6 +1029,9 @@
...
@@ -1029,6 +1029,9 @@
/* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */
/* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */
#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
/* Define to 1 if you have the <X11/extensions/xf86vmproto.h> header file. */
#undef HAVE_X11_EXTENSIONS_XF86VMPROTO_H
/* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */
/* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */
#undef HAVE_X11_EXTENSIONS_XINERAMA_H
#undef HAVE_X11_EXTENSIONS_XINERAMA_H
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment