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
aff4cad7
Commit
aff4cad7
authored
Sep 06, 2012
by
Benjamin Drung
Committed by
Rafaël Carré
Sep 06, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not ship UAC.dll in source tarball.
Close #7436 Signed-off-by:
Rafaël Carré
<
funman@videolan.org
>
parent
0bafe94c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
3 deletions
+14
-3
Makefile.am
Makefile.am
+0
-1
extras/package/win32/UAC.dll
extras/package/win32/UAC.dll
+0
-0
extras/package/win32/package.mak
extras/package/win32/package.mak
+14
-2
No files found.
Makefile.am
View file @
aff4cad7
...
@@ -24,7 +24,6 @@ EXTRA_DIST = \
...
@@ -24,7 +24,6 @@ EXTRA_DIST = \
extras/package/win32/vlc.win32.nsi.in
\
extras/package/win32/vlc.win32.nsi.in
\
extras/package/win32/spad.nsi.in
\
extras/package/win32/spad.nsi.in
\
extras/package/win32/UAC.nsh
\
extras/package/win32/UAC.nsh
\
extras/package/win32/UAC.dll
\
extras/package/win32/languages/declaration.nsh
\
extras/package/win32/languages/declaration.nsh
\
extras/package/win32/languages/bengali.nsh
\
extras/package/win32/languages/bengali.nsh
\
extras/package/win32/languages/basque.nsh
\
extras/package/win32/languages/basque.nsh
\
...
...
extras/package/win32/UAC.dll
deleted
100755 → 0
View file @
0bafe94c
File deleted
extras/package/win32/package.mak
View file @
aff4cad7
...
@@ -129,13 +129,25 @@ package-win32-crx: package-win32-webplugin-common
...
@@ -129,13 +129,25 @@ package-win32-crx: package-win32-webplugin-common
--extension-output
"
$(win32_destdir)
/vlc-
$(VERSION)
.crx"
--ignore-file
install.rdf
--extension-output
"
$(win32_destdir)
/vlc-
$(VERSION)
.crx"
--ignore-file
install.rdf
package-win32-exe
:
package-win-strip
# nsis is a 32-bits installer, we need to build a 32bits DLL
$(win32_destdir)/NSIS/UAC.dll
:
extras/package/win32/UAC/runas.cpp extras/package/win32/UAC/uac.cpp
mkdir
-p
"
$(win32_destdir)
/NSIS/"
if
HAVE_WIN64
i686-w64-mingw32-g++
$^
-shared
-o
$@
-lole32
i686-w64-mingw32-strip
$@
else
$(CXX)
$^
-shared
-o
$@
-lole32
$(STRIP)
$@
endif
package-win32-exe
:
package-win-strip $(win32_destdir)/NSIS/UAC.dll
# Script installer
# Script installer
cd
"$(top_builddir)/extras/package/win32"
&&
cp
vlc.win32.nsi
spad.nsi
"$(win32_destdir)/"
cd
"$(top_builddir)/extras/package/win32"
&&
cp
vlc.win32.nsi
spad.nsi
"$(win32_destdir)/"
cp
-r
$(srcdir)/extras/package/win32/languages/
"$(win32_destdir)/"
cp
-r
$(srcdir)/extras/package/win32/languages/
"$(win32_destdir)/"
cp
-r
$(srcdir)/extras/package/win32/helpers/
"$(win32_destdir)/"
cp
-r
$(srcdir)/extras/package/win32/helpers/
"$(win32_destdir)/"
mkdir
-p
"$(win32_destdir)/NSIS/"
mkdir
-p
"$(win32_destdir)/NSIS/"
c
d
"$(top_srcdir)/extras/package/win32/"
&&
cp
UAC.dll
UAC.nsh
"$(win32_destdir)/NSIS
"
c
p
"$(top_srcdir)/extras/package/win32/UAC.nsh"
"$(win32_destdir)/NSIS/
"
# Create package
# Create package
if
makensis
-VERSION
>/dev/null
2>&1;
then
\
if
makensis
-VERSION
>/dev/null
2>&1;
then
\
...
...
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