Commit 0ca651f0 authored by Sam Hocevar's avatar Sam Hocevar

* Don't use PIC on WIN32.

parent 7483d688
...@@ -152,6 +152,12 @@ EXTRA_LIBRARIES = libnpvlc.a ...@@ -152,6 +152,12 @@ EXTRA_LIBRARIES = libnpvlc.a
endif endif
endif endif
if HAVE_WIN32
pic =
else
pic = pic
endif
libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla`
libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla`
...@@ -159,11 +165,11 @@ libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -avoid-version ...@@ -159,11 +165,11 @@ libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -avoid-version
libvlcplugin_la_LIBADD = ../src/libvlc.la libvlcplugin_la_LIBADD = ../src/libvlc.la
libnpvlc_a_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) libnpvlc_a_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \ libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla $(pic)` \
$(CPPFLAGS_mozilla_EXTRA) $(CPPFLAGS_mozilla_EXTRA)
libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \ libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla $(pic)` \
$(CPPFLAGS_mozilla_EXTRA) $(CPPFLAGS_mozilla_EXTRA)
LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin pic` LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin $(pic)`
libnpvlc_a_DEPENDENCIES = $(DATA_npvlc_rc) libnpvlc_a_DEPENDENCIES = $(DATA_npvlc_rc)
$(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
...@@ -176,7 +182,7 @@ $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic ...@@ -176,7 +182,7 @@ $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
# Stamp rules # Stamp rules
############################################################################### ###############################################################################
stamp-pic: stamp-pic:
@for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \ @for dep in "" `$(VLC_CONFIG) --target builtin $(pic)`; do \
if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \ if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \
rm -f $@; \ rm -f $@; \
break; \ break; \
......
...@@ -188,6 +188,12 @@ else ...@@ -188,6 +188,12 @@ else
lib_LIBRARIES = libvlc.a lib_LIBRARIES = libvlc.a
endif endif
if HAVE_WIN32
pic =
else
pic = pic
endif
if HAVE_WIN32 if HAVE_WIN32
if BUILD_SHARED if BUILD_SHARED
DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a
......
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