Skip to content

V
vlc-2-2
Commit ca74f7fc authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

VLC resource file is only for Win32

parent aa266132
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
bin/Makefile.am
View file @ ca74f7fc
...@@ -15,7 +15,7 @@ vlc_SOURCES = winvlc.c ...@@ -15,7 +15,7 @@ vlc_SOURCES = winvlc.c
endif endif
vlc_wrapper_SOURCES = rootwrap.c vlc_wrapper_SOURCES = rootwrap.c
vlc_DEPENDENCIES = $(DATA_win32_rc) ../src/libvlc.la vlc_DEPENDENCIES = ../src/libvlc.la
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc` vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
...@@ -26,16 +26,11 @@ vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LTLIBINTL) \ ...@@ -26,16 +26,11 @@ vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LTLIBINTL) \
#vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) #vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
# $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) # $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)
DATA_win32_rc = vlc_win32_rc.$(OBJEXT)
DATA_win32_rc_lib = libvlc_win32_rc.$(OBJEXT)
EXTRA_DATA = $(DATA_win32_rc) $(DATA_win32_rc_lib)
if HAVE_WIN32 if HAVE_WIN32
vlc_LDADD += $(DATA_win32_rc) vlc_LDADD += vlc_win32_rc.$(OBJEXT)
noinst_DATA = $(DATA_win32_rc) $(DATA_win32_rc_lib) vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT)
endif endif
vlc_win32_rc.$(OBJEXT): $(top_builddir)/share/vlc_win32_rc.rc vlc_win32_rc.$(OBJEXT): $(top_builddir)/share/vlc_win32_rc.rc
$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@ $(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 $@
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