Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
1ca3578e
Commit
1ca3578e
authored
Jul 27, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove xml2 dependency for freetype and libass on Win32
parent
4fdaf53d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
configure.ac
configure.ac
+6
-6
No files found.
configure.ac
View file @
1ca3578e
...
@@ -3749,7 +3749,7 @@ AS_IF( [test "${enable_zvbi}" != "no"],[
...
@@ -3749,7 +3749,7 @@ AS_IF( [test "${enable_zvbi}" != "no"],[
[
[
VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
if test "${SYS}" = "mingw32"; then
if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([zvbi],[ -lpthreadGC2])
VLC_ADD_LIBS([zvbi],[ -lpthreadGC2])
fi
fi
VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
VLC_ADD_PLUGIN([zvbi])
VLC_ADD_PLUGIN([zvbi])
...
@@ -3798,7 +3798,7 @@ AS_IF( [test "${enable_libass}" = "yes"], [
...
@@ -3798,7 +3798,7 @@ AS_IF( [test "${enable_libass}" = "yes"], [
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
[VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
[VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
if test "${SYS}" = "mingw32"; then
if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lz
-lxml2
])
VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lz])
else
else
VLC_ADD_LIBS([libass],[-lfontconfig])
VLC_ADD_LIBS([libass],[-lfontconfig])
fi
fi
...
@@ -3819,8 +3819,8 @@ AS_IF( [test "${enable_asademux}" = "yes"], [
...
@@ -3819,8 +3819,8 @@ AS_IF( [test "${enable_asademux}" = "yes"], [
[
[
VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS])
VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS])
VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS])
VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS])
if test "${SYS}" = "mingw32"; then
if test "${SYS}" = "mingw32"; then
VLC_ADD_CPPFLAGS([asademux],[-DPCRE_STATIC])
VLC_ADD_CPPFLAGS([asademux],[-DPCRE_STATIC])
fi
fi
VLC_ADD_PLUGIN([asademux])
VLC_ADD_PLUGIN([asademux])
],[
],[
...
@@ -4239,7 +4239,7 @@ then
...
@@ -4239,7 +4239,7 @@ then
VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
if test "${SYS}" = "mingw32"; then
if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([
freetype
skins2],[-lxml2])
VLC_ADD_LIBS([skins2],[-lxml2])
VLC_ADD_LIBS([freetype],[-liconv])
VLC_ADD_LIBS([freetype],[-liconv])
fi
fi
if test "${enable_fontconfig}" != "no"
if test "${enable_fontconfig}" != "no"
...
@@ -5271,7 +5271,7 @@ dnl
...
@@ -5271,7 +5271,7 @@ dnl
if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then
AC_ARG_ENABLE(atmo,
AC_ARG_ENABLE(atmo,
AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew philips ambilight)
AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew philips ambilight)
(default enabled)]))
(default enabled)]))
if test "${enable_atmo}" != "no"; then
if test "${enable_atmo}" != "no"; then
AC_LANG_PUSH(C++)
AC_LANG_PUSH(C++)
VLC_ADD_PLUGIN([atmo])
VLC_ADD_PLUGIN([atmo])
...
...
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