Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
7d4018a6
Commit
7d4018a6
authored
Oct 04, 2007
by
Olivier Aubert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bundle libvlc-control.dll in the win32 installer
parent
e53c7cec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
configure.ac
configure.ac
+2
-0
vlc.win32.nsi.in
vlc.win32.nsi.in
+7
-0
No files found.
configure.ac
View file @
7d4018a6
...
...
@@ -5975,6 +5975,7 @@ dnl Pic and shared libvlc stuff
dnl
AS_IF([test "${SYS}" = "mingw32"], [
FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"
FILE_LIBVLC_CONTROL_DLL="!define LIBVLC_CONTROL_DLL libvlc-control.dll"
])
dnl
...
...
@@ -6036,6 +6037,7 @@ AC_SUBST(LIBEXT)
AC_SUBST(AM_CPPFLAGS)
AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
AC_SUBST(FILE_LIBVLC_DLL)
AC_SUBST(FILE_LIBVLC_CONTROL_DLL)
dnl Create vlc-config.in
VLC_OUTPUT_VLC_CONFIG_IN
...
...
vlc.win32.nsi.in
View file @
7d4018a6
...
...
@@ -18,6 +18,7 @@
!define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
@FILE_LIBVLC_DLL@
@FILE_LIBVLC_CONTROL_DLL@
;;;;;;;;;;;;;;;;;;;;;;;;;
; General configuration ;
...
...
@@ -350,6 +351,9 @@ Section "Media player (required)" SEC01
!ifdef LIBVLC_DLL
!insertmacro InstallFile ${LIBVLC_DLL}
!endif
!ifdef LIBVLC_CONTROL_DLL
!insertmacro InstallFile ${LIBVLC_CONTROL_DLL}
!endif
!insertmacro InstallFile *.txt
!insertmacro InstallFolder plugins
...
...
@@ -490,6 +494,9 @@ Section /o "Mozilla plugin" SEC03
; !ifdef LIBVLC_DLL
; CopyFiles ${LIBVLC_DLL} "$R2"
; !endif
; !ifdef LIBVLC_CONTROL_DLL
; CopyFiles ${LIBVLC_CONTROL_DLL} "$R2"
; !endif
; Goto "${Index}-Loop"
;"${Index}-End:"
...
...
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