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
098b6f26
Commit
098b6f26
authored
Jul 02, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Win32: prepare "make install" to work.
parent
8fc10b42
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
configure.ac
configure.ac
+8
-2
modules/Makefile.am
modules/Makefile.am
+1
-1
No files found.
configure.ac
View file @
098b6f26
...
@@ -339,17 +339,20 @@ case "${host_os}" in
...
@@ -339,17 +339,20 @@ case "${host_os}" in
dnl
dnl
AC_ARG_ENABLE(peflags,
AC_ARG_ENABLE(peflags,
[ --enable-peflags peflags use (default enabled on Windows)])
[ --enable-peflags peflags use (default enabled on Windows)])
if test "${enable_peflags}" != "no"
if test "${enable_peflags}" != "no" ; then
then
AC_CHECK_TOOL(PEFLAGS, peflags, :)
AC_CHECK_TOOL(PEFLAGS, peflags, :)
fi
fi
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
ac_default_prefix="`pwd`/_win32"
DESTDIR="`pwd`/_win32/"
fi
fi
if test "${SYS}" = "mingwce"; then
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
# add ws2 for closesocket, select, recv
VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2])
VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
ac_default_prefix="`pwd`/_wince"
DESTDIR="`pwd`/_wince/"
fi
fi
;;
;;
*nto*)
*nto*)
...
@@ -4319,7 +4322,10 @@ AS_IF([test "x$KDE4_CONFIG" = "x"], [
...
@@ -4319,7 +4322,10 @@ AS_IF([test "x$KDE4_CONFIG" = "x"], [
AC_ARG_WITH(kde-solid,
AC_ARG_WITH(kde-solid,
AS_HELP_STRING([--with-kde-solid=PATH],
AS_HELP_STRING([--with-kde-solid=PATH],
[KDE Solid actions directory (auto)]),, [
[KDE Solid actions directory (auto)]),, [
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ; then
with_kde_solid="yes"
with_kde_solid="yes"
fi
])
])
soliddatadir=""
soliddatadir=""
AS_IF([test "${with_kde_solid}" != "no"], [
AS_IF([test "${with_kde_solid}" != "no"], [
...
...
modules/Makefile.am
View file @
098b6f26
...
@@ -70,7 +70,7 @@ stamp-cache:
...
@@ -70,7 +70,7 @@ stamp-cache:
$(AM_V_at)
touch
stamp-cache
$(AM_V_at)
touch
stamp-cache
install-exec-hook
:
install-exec-hook
:
if
test
-z
"
$(DESTDIR)
"
;
then
\
if
test
-z
"
$(DESTDIR)
"
-a
"
$(build)
"
=
"
$(host)
"
;
then
\
../bin/vlc-cache-gen
$(EXEEXT)
"
$(vlclibdir)
/plugins"
;
\
../bin/vlc-cache-gen
$(EXEEXT)
"
$(vlclibdir)
/plugins"
;
\
else
\
else
\
echo
"Staged installation: cache generation skipped!"
;
\
echo
"Staged installation: cache generation skipped!"
;
\
...
...
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