Commit 19bed424 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Generate Windows resource file on need basis

parent 4ca436a5
......@@ -4,6 +4,9 @@ bin_PROGRAMS = vlc
noinst_PROGRAMS = vlc-static
vlclib_PROGRAMS = vlc-cache-gen
EXTRA_PROGRAMS = vlc-wrapper
EXTRA_DIST = vlc_win32_rc.rc.in
SUFFIXES = .rc.in .rc
AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
......@@ -18,6 +21,7 @@ endif
EXTRA_vlc_SOURCES = vlc.c winvlc.c
if HAVE_WIN32
vlc_SOURCES = winvlc.c
noinst_DATA = vlc_win32_rc.rc
endif
if HAVE_WINCE
vlc_SOURCES = winvlc.c
......@@ -44,7 +48,11 @@ vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT)
endif
vlc_win32_rc.$(OBJEXT): $(top_builddir)/share/vlc_win32_rc.rc
.rc.in.rc: $(top_builddir)/config.status
cd "$(top_builddir)" && \
$(SHELL) ./config.status --file="bin/$@"
vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
vlc_cache_gen_SOURCES = cachegen.c
......
......@@ -4935,8 +4935,6 @@ AC_CONFIG_FILES([
projects/mozilla/vlc.r
projects/mozilla/install.js
share/Makefile
share/vlc_win32_rc.rc
share/libvlc_win32_rc.rc
compat/Makefile
src/Makefile
src/test/Makefile
......
......@@ -55,9 +55,7 @@ DIST_rsrc = \
newres.h \
resource.h \
vlc_wince_rc.rc \
vlc_beos.rsrc \
vlc_win32_rc.rc.in \
libvlc_win32_rc.rc.in
vlc_beos.rsrc
DIST_icons = vlc.ico
......
......@@ -16,7 +16,7 @@ EXTRA_DIST = extras/COPYING \
BUILT_SOURCES = ../include/vlc_about.h
CLEANFILES = $(BUILT_SOURCES)
SUFFIXES = .pc.in .pc
SUFFIXES = .pc.in .pc .rc.in .rc
###############################################################################
# Headers
......@@ -157,6 +157,19 @@ CLEANFILES += $(pkgconfig_DATA)
cd "$(top_builddir)" && \
$(SHELL) ./config.status --file="src/$@"
##############################################################################
# Windows resource files
##############################################################################
if HAVE_WIN32
noinst_DATA = libvlc_win32_rc.rc
endif
EXTRA_DIST += libvlc_win32_rc.rc.in
.rc.in.rc: $(top_builddir)/config.status
cd "$(top_builddir)" && \
$(SHELL) ./config.status --file="src/$@"
###############################################################################
# Building libvlc
###############################################################################
......@@ -195,7 +208,7 @@ libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
endif
libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
libvlc_la_SOURCES = $(SOURCES_libvlc_control)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment