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
eaa615ce
Commit
eaa615ce
authored
Jul 24, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Finish the zvbi port to Windows.
The .dll is still a bit big, because of static linking to libiconv, I think
parent
731d6aa7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
17 deletions
+17
-17
configure.ac
configure.ac
+15
-15
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+1
-1
extras/package/win32/configure-common.sh
extras/package/win32/configure-common.sh
+1
-1
No files found.
configure.ac
View file @
eaa615ce
...
@@ -353,7 +353,7 @@ case "${host_os}" in
...
@@ -353,7 +353,7 @@ case "${host_os}" in
VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([activex mozilla],[-lgdi32])
VLC_ADD_LIBS([activex mozilla],[-lgdi32])
VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-lwinmm])
VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-lwinmm])
VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd],[-lws2_32])
VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd
zvbi
],[-lws2_32])
VLC_ADD_LIBS([access_file], [-lshlwapi])
VLC_ADD_LIBS([access_file], [-lshlwapi])
fi
fi
if test "${SYS}" = "mingwce"; then
if test "${SYS}" = "mingwce"; then
...
@@ -3738,26 +3738,26 @@ dnl uncompatible
...
@@ -3738,26 +3738,26 @@ dnl uncompatible
dnl
dnl
AC_ARG_ENABLE(zvbi,
AC_ARG_ENABLE(zvbi,
AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with
AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with
libzvbi (default enabled)]))
libzvbi (default enabled)]))
AC_ARG_ENABLE(telx,
AC_ARG_ENABLE(telx,
AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with
AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with
zvbi) (default enabled if zvbi is absent)]))
zvbi) (default enabled if zvbi is absent)]))
AS_IF( [test "${enable_zvbi}" != "no"],[
AS_IF( [test "${enable_zvbi}" != "no"],[
PKG_CHECK_MODULES(ZVBI,
PKG_CHECK_MODULES(ZVBI,
zvbi-0.2 >= 0.2.25,
zvbi-0.2 >= 0.2.25,
[
[
VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
VLC_ADD_PLUGIN([zvbi])
VLC_ADD_PLUGIN([zvbi])
AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built])
AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built])
AS_IF( [test "${enable_telx}" = "yes"],[
AS_IF( [test "${enable_telx}" = "yes"],[
AC_MSG_WARN([The zvbi and telx modules are uncompatibles.
AC_MSG_WARN([The zvbi and telx modules are uncompatibles.
Using zvbi.])
Using zvbi.])
])
])
],[
],[
AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead)
AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead)
])
])
])
])
AS_IF( [test "${enable_telx}" != "no" ],[
AS_IF( [test "${enable_telx}" != "no" ],[
VLC_ADD_PLUGIN([telx])
VLC_ADD_PLUGIN([telx])
...
...
extras/contrib/src/Makefile
View file @
eaa615ce
...
@@ -1759,7 +1759,7 @@ ifdef HAVE_DARWIN_OS
...
@@ -1759,7 +1759,7 @@ ifdef HAVE_DARWIN_OS
(
cd
$<
;
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
CFLAGS
=
"
$(CFLAGS)
-fnested-functions"
&&
make
&&
make
install
)
(
cd
$<
;
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
CFLAGS
=
"
$(CFLAGS)
-fnested-functions"
&&
make
&&
make
install
)
else
else
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
(
cd
$<
;
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
CFLAGS
=
"
$(CFLAGS)
--std=gnu99"
&&
make
&&
make
install
)
(
cd
$<
;
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
CFLAGS
=
"
$(CFLAGS)
-
DPTW32_STATIC_LIB -
-std=gnu99"
&&
make
&&
make
install
)
else
else
(
cd
$<
;
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
CFLAGS
=
"
$(CFLAGS)
"
&&
make
-C
src
&&
make
-C
src
install
)
(
cd
$<
;
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
CFLAGS
=
"
$(CFLAGS)
"
&&
make
-C
src
&&
make
-C
src
install
)
endif
endif
...
...
extras/package/win32/configure-common.sh
View file @
eaa615ce
...
@@ -28,5 +28,5 @@
...
@@ -28,5 +28,5 @@
--enable-sse
--enable-mmx
\
--enable-sse
--enable-mmx
\
--disable-gnomevfs
--disable-hal
\
--disable-gnomevfs
--disable-hal
\
--disable-cddax
--disable-vcdx
--disable-libcdio
--disable-vcdinfo
\
--disable-cddax
--disable-vcdx
--disable-libcdio
--disable-vcdinfo
\
--disable-libcddb
--disable-dvb
--
disable-zvbi
--en
able-telx
\
--disable-libcddb
--disable-dvb
--
enable-zvbi
--dis
able-telx
\
--disable-pulse
--disable-pulse
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