connectioncontainer.h \
objectsafety.cpp \
objectsafety.h \
+ dataobject.cpp \
+ dataobject.h \
+ viewobject.cpp \
+ viewobject.h \
vlccontrol.cpp \
vlccontrol.h \
plugin.cpp \
DIST_misc = \
README.TXT \
+ axvlc.inf.in \
axvlc.def \
axvlc.idl \
axvlc.tlb \
inplace.bmp \
+ vlc16x16.bmp \
test.html \
$(NULL)
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
+if BUILD_SHARED
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
+else
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
+endif
if BUILD_ACTIVEX
axvlc_DATA = axvlc$(LIBEXT)
axvlcdir = $(libdir)
-LDFLAGS_activex = `$(VLC_CONFIG) --libs vlc activex builtin`
+LDFLAGS_activex = `$(VLC_CONFIG) --libs activex vlc builtin`
libaxvlc_a_SOURCES = $(SOURCES_activex) $(SOURCE_dll)
libaxvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags activex`
$(libaxvlc_a_DEPENDENCIES) stamp-pic
$(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
-Wl,--enable-stdcall-fixup $(srcdir)/axvlc.def \
- $(LIBRARIES_libvlc) -shared $(LDFLAGS_activex)
+ $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LDFLAGS_activex) \
+ $(INCLUDED_LIBINTL)
+# Cygwin work-around
+ @if test -f "$@.exe"; then mv "$@.exe" "$@"; fi
DATA_axvlc_tlb = $(axvlc_tlb_DATA)
noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)
noinst_axvlc_rcdir = $(libdir)
axvlc_rc.$(OBJEXT): axvlc_rc.rc inplace.bmp axvlc.tlb
- $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir) -i $< -o $@
+ $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/[^0-9]*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir) -i $< -o $@
else