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
8e587b3f
Commit
8e587b3f
authored
Aug 13, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change freetype libs order to fix win32 compile
parent
92f02a13
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
configure.ac
configure.ac
+11
-9
No files found.
configure.ac
View file @
8e587b3f
...
@@ -3700,10 +3700,10 @@ then
...
@@ -3700,10 +3700,10 @@ then
VLC_ADD_PLUGIN([freetype])
VLC_ADD_PLUGIN([freetype])
have_freetype=yes
have_freetype=yes
VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
if test "${SYS}" = "mingw32"; then
if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([freetype],[-liconv -lz])
VLC_ADD_LIBS([freetype],[-liconv -lz])
fi
fi
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
if test "${enable_fontconfig}" != "no"
if test "${enable_fontconfig}" != "no"
then
then
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
...
@@ -3712,6 +3712,16 @@ then
...
@@ -3712,6 +3712,16 @@ then
AC_CHECK_HEADERS(Carbon/Carbon.h,
AC_CHECK_HEADERS(Carbon/Carbon.h,
[VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
[VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
fi
fi
dnl fribidi support
if test "${enable_fribidi}" != "no"
then
PKG_CHECK_MODULES(FRIBIDI, fribidi, [
VLC_ADD_CPPFLAGS([freetype skins2], [${FRIBIDI_CFLAGS} -DHAVE_FRIBIDI])
VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}])
])
fi
],[
],[
have_freetype=no
have_freetype=no
AS_IF([ test "${enable_freetype}" = "yes"],[
AS_IF([ test "${enable_freetype}" = "yes"],[
...
@@ -3721,14 +3731,6 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice
...
@@ -3721,14 +3731,6 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice
])
])
])
])
dnl fribidi support
if test "${enable_fribidi}" != "no"
then
PKG_CHECK_MODULES(FRIBIDI, fribidi, [
VLC_ADD_CPPFLAGS([freetype skins2], [${FRIBIDI_CFLAGS} -DHAVE_FRIBIDI])
VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}])
])
fi
fi
fi
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