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
20a89568
Commit
20a89568
authored
Aug 04, 2008
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32: no need of an icon for the dll
Save 2 x 85ko
parent
2f09fc88
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
7 deletions
+37
-7
configure.ac
configure.ac
+1
-0
share/Makefile.am
share/Makefile.am
+2
-1
share/libvlc_win32_rc.rc.in
share/libvlc_win32_rc.rc.in
+24
-0
src/Makefile.am
src/Makefile.am
+10
-6
No files found.
configure.ac
View file @
20a89568
...
...
@@ -5806,6 +5806,7 @@ AC_CONFIG_FILES([
projects/mozilla/npvlc_rc.rc
share/Makefile
share/vlc_win32_rc.rc
share/libvlc_win32_rc.rc
src/Makefile
test/Makefile
])
...
...
share/Makefile.am
View file @
20a89568
...
...
@@ -60,7 +60,8 @@ DIST_rsrc = \
resource.h
\
vlc_wince_rc.rc
\
vlc_beos.rsrc
\
vlc_win32_rc.rc
vlc_win32_rc.rc.in
\
libvlc_win32_rc.rc.in
DIST_pda
=
\
pda-forwardb16x16.xpm
\
...
...
share/libvlc_win32_rc.rc.in
0 → 100644
View file @
20a89568
#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@
1 VERSIONINFO
FILETYPE 1
FILEOS 4
PRODUCTVERSION VERSION_NUMBER
FILEVERSION VERSION_NUMBER
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "the VideoLAN Team"
VALUE "FileVersion", "@VERSION@"
VALUE "FileDescription", "VLC media player"
VALUE "LegalCopyright", "(c) @COPYRIGHT_YEARS@ the VideoLAN Team"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
src/Makefile.am
View file @
20a89568
...
...
@@ -182,8 +182,8 @@ libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
libvlccore_la_LIBADD
=
`
$(VLC_CONFIG)
-libs
libvlc
`
$(AM_LIBADD)
$(LTLIBINTL)
libvlccore_la_DEPENDENCIES
=
libvlccore.sym
if
HAVE_WIN32
libvlccore_la_DEPENDENCIES
+=
$(DATA_win32_rc)
libvlccore_la_LDFLAGS
+=
-Wl
,
$(DATA_win32_rc)
libvlccore_la_DEPENDENCIES
+=
$(DATA_win32_rc
_lib
)
libvlccore_la_LDFLAGS
+=
-Wl
,
$(DATA_win32_rc
_lib
)
endif
libvlc_la_SOURCES
=
$(SOURCES_libvlc_control)
...
...
@@ -195,8 +195,8 @@ libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
-export-symbols
$(srcdir)
/libvlc.sym
libvlc_la_DEPENDENCIES
=
libvlc.sym libvlccore.la
if
HAVE_WIN32
libvlc_la_DEPENDENCIES
+=
$(DATA_win32_rc)
libvlc_la_LDFLAGS
+=
-Wl
,
$(DATA_win32_rc)
libvlc_la_DEPENDENCIES
+=
$(DATA_win32_rc
_lib
)
libvlc_la_LDFLAGS
+=
-Wl
,
$(DATA_win32_rc
_lib
)
endif
...
...
@@ -477,11 +477,15 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
eval
$$
cmd
if
HAVE_WIN32
DATA_win32_rc
=
$(noinst_DATA)
noinst_DATA
=
vlc_win32_rc.
$(OBJEXT)
DATA_win32_rc
=
vlc_win32_rc.
$(OBJEXT)
DATA_win32_rc_lib
=
libvlc_win32_rc.
$(OBJEXT)
noinst_DATA
=
$(DATA_win32_rc)
$(DATA_win32_rc_lib)
vlc_win32_rc.$(OBJEXT)
:
$(top_builddir)/share/vlc_win32_rc.rc
$(WINDRES)
--include-dir
$(top_srcdir)
/share
-i
$<
-o
$@
libvlc_win32_rc.$(OBJEXT)
:
$(top_builddir)/share/libvlc_win32_rc.rc
$(WINDRES)
--include-dir
$(top_srcdir)
/share
-i
$<
-o
$@
endif
endif
...
...
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