# Building the Activex plugin
###############################################################################
-noinst_LIBRARIES = $(noinst_LIBRARIES_activex)
-
-MOSTLYCLEANFILES = $(LIBRARIES_activex)
+MOSTLYCLEANFILES =
EXTRA_DIST = $(SOURCES_activex) $(DIST_rsrc) $(DIST_misc)
BUILT_SOURCES = $(BUILT_SOURCES_activex)
connectioncontainer.h \
objectsafety.cpp \
objectsafety.h \
+ dataobject.cpp \
+ dataobject.h \
+ viewobject.cpp \
+ viewobject.h \
+ supporterrorinfo.cpp \
+ supporterrorinfo.h \
vlccontrol.cpp \
vlccontrol.h \
+ vlccontrol2.cpp \
+ vlccontrol2.h \
plugin.cpp \
plugin.h \
axvlc_idl.c \
axvlc_idl.h \
+ guiddef.h \
$(NULL)
DIST_rsrc = \
DIST_misc = \
README.TXT \
+ axvlc.inf.in \
axvlc.def \
axvlc.idl \
- axvlc.reg \
axvlc.tlb \
inplace.bmp \
+ vlc16x16.bmp \
test.html \
$(NULL)
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
-
if BUILD_ACTIVEX
-noinst_LIBRARIES_activex = libaxvlc.a
-axvlc_DATA = axvlc$(LIBEXT)
-axvlcdir = $(libdir)
-
-LDFLAGS_activex = `$(VLC_CONFIG) --libs vlc activex builtin`
+lib_LTLIBRARIES = axvlc.la
-libaxvlc_a_SOURCES = $(SOURCES_activex) $(SOURCE_dll)
-libaxvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags activex`
-libaxvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags activex`
-libaxvlc_a_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc)
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \
+ $(top_builddir)/src/libvlc.la
-axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
- $(libaxvlc_a_DEPENDENCIES) stamp-pic
- $(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) -Wl,--enable-stdcall-fixup axvlc.def \
- $(LIBRARIES_libvlc) -shared $(LDFLAGS_activex)
+axvlc_la_SOURCES = $(SOURCES_activex)
+axvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags activex`
+axvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags activex`
+axvlc_la_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc) $(LIBRARIES_libvlc)
+axvlc_la_LDFLAGS = $(srcdir)/axvlc.def -Wl,$(DATA_axvlc_rc) \
+ -no-undefined -avoid-version -module \
+ `$(VLC_CONFIG) --libs activex libvlc`
+axvlc_la_LIBADD = $(LIBRARIES_libvlc)
+DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
+noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)
+noinst_axvlc_rcdir =
+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]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir) -i $< -o $@
DATA_axvlc_tlb = $(axvlc_tlb_DATA)
noinst_axvlc_tlb_DATA = axvlc.tlb
$(MIDL) -Oicf -error all -env win32 -tlb axvlc.tlb -iid axvlc_idl.c -h axvlc_idl.h axvlc.idl
clean-tlb:
- -rm axvlc.tlb axvlc_idl.c axvlc_idl.h
+ rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h
else
+if HAS_WIDL_COMPILER
-clean-tlb:
-
-endif
+axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl
+ $(WIDL) -I$(WINE_SDK_PATH)/include -tuh -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h axvlc.idl
-DATA_axvlc_rc = $(noinst_axvlc_rc_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 $@
+clean-tlb:
+ rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h
else
clean-tlb:
+endif
endif
-###############################################################################
-# Stamp rules
-###############################################################################
+else
-clean-stamp:
- rm -f stamp-pic
+clean-tlb:
-stamp-pic: FORCE
- @for dep in "" `$(VLC_CONFIG) --target builtin`; do \
- if test "$${dep}" -nt "$(LIBRARIES_activex)"; then \
- rm -f $@; \
- break; \
- fi; \
- done
- @if test ! -f $@; then printf "" > $@; fi
+endif
###############################################################################
# Clean rules
###############################################################################
-clean-local: clean-stamp clean-tlb
- -rm axvlc$(LIBEXT)
+clean-local: clean-tlb
###############################################################################
-# Force rule
+# Force rules
###############################################################################
-FORCE: