Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
dd537f5c
Commit
dd537f5c
authored
Sep 08, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Configure.ac cleanup around directX
parent
ebb0847c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
37 deletions
+21
-37
configure.ac
configure.ac
+21
-37
No files found.
configure.ac
View file @
dd537f5c
...
@@ -3804,16 +3804,13 @@ AC_ARG_ENABLE(directx,
...
@@ -3804,16 +3804,13 @@ AC_ARG_ENABLE(directx,
if test "${enable_directx}" != "no"
if test "${enable_directx}" != "no"
then
then
if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"
if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"
then
AC_ARG_WITH(directx,
[ --with-directx=PATH Win32 DirectX headers])
if test -z "${with_directx}"
then
then
AC_CHECK_HEADERS(ddraw.h,
AC_CHECK_HEADERS(ddraw.h,
[ VLC_ADD_PLUGIN([directx])
[ VLC_ADD_PLUGIN([directx])
VLC_ADD_PLUGIN([aout_directx])
VLC_ADD_PLUGIN([aout_directx])
VLC_ADD_LIBS([directx],[-lgdi32])
VLC_ADD_LIBS([directx],[-lgdi32])
])
],[AC_MSG_ERROR([Cannot find DirectX headers!])]
)
AC_CHECK_HEADERS(GL/gl.h,
AC_CHECK_HEADERS(GL/gl.h,
[ VLC_ADD_PLUGIN([glwin32])
[ VLC_ADD_PLUGIN([glwin32])
VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32])
VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32])
...
@@ -3823,23 +3820,28 @@ then
...
@@ -3823,23 +3820,28 @@ then
VLC_ADD_LIBS([direct3d],[-lgdi32])
VLC_ADD_LIBS([direct3d],[-lgdi32])
])
])
VLC_ADD_LIBS([direct3d directx glwin32],[-lole32])
VLC_ADD_LIBS([direct3d directx glwin32],[-lole32])
else
AC_MSG_CHECKING(for directX headers in ${with_directx})
if test -f ${with_directx}/ddraw.h
then
VLC_ADD_PLUGIN([directx])
VLC_ADD_PLUGIN([aout_directx])
VLC_ADD_CPPFLAGS([directx aout_directx],[-I${with_directx}])
VLC_ADD_LIBS([directx],[-lgdi32])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AC_MSG_ERROR([Cannot find ${with_directx}/ddraw.h!])
fi
fi
fi
dnl
dnl win32 GDI plugin
dnl
AC_ARG_ENABLE(wingdi,
[ --enable-wingdi Win32 GDI module (default enabled on Win32)])
if test "${enable_wingdi}" != "no"; then
if test "${SYS}" = "mingw32"; then
VLC_ADD_PLUGIN([wingdi])
VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32])
fi
fi
if test "${SYS}" = "mingwce"; then
VLC_ADD_PLUGIN([wingdi])
VLC_ADD_PLUGIN([wingapi])
VLC_ADD_LIBS([wingdi],[-laygshell])
VLC_ADD_LIBS([wingapi],[-laygshell])
fi
fi
fi
fi
dnl
dnl
dnl Linux framebuffer module
dnl Linux framebuffer module
dnl
dnl
...
@@ -3999,24 +4001,6 @@ dnl libcaca plugin
...
@@ -3999,24 +4001,6 @@ dnl libcaca plugin
dnl
dnl
PKG_ENABLE_MODULES_VLC([caca], [], [caca >= 0.99.beta1], [libcaca output],[auto])
PKG_ENABLE_MODULES_VLC([caca], [], [caca >= 0.99.beta1], [libcaca output],[auto])
dnl
dnl win32 GDI plugin
dnl
AC_ARG_ENABLE(wingdi,
[ --enable-wingdi Win32 GDI module (default enabled on Win32)])
if test "${enable_wingdi}" != "no"; then
if test "${SYS}" = "mingw32"; then
VLC_ADD_PLUGIN([wingdi])
VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32])
fi
if test "${SYS}" = "mingwce"; then
VLC_ADD_PLUGIN([wingdi])
VLC_ADD_PLUGIN([wingapi])
VLC_ADD_LIBS([wingdi],[-laygshell])
VLC_ADD_LIBS([wingapi],[-laygshell])
fi
fi
dnl
dnl
dnl Audio plugins
dnl Audio plugins
dnl
dnl
...
...
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