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.tlb \
inplace.bmp \
+ vlc16x16.bmp \
test.html \
$(NULL)
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
if BUILD_ACTIVEX
axvlc_DATA = axvlc$(LIBEXT)
axvlcdir = $(libdir)
-LDFLAGS_activex = `$(VLC_CONFIG) --libs vlc activex builtin`
+LDFLAGS_activex = `$(VLC_CONFIG) --libs activex libvlc`
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)
+libaxvlc_a_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc) $(LIBRARIES_libvlc)
axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
- $(libaxvlc_a_DEPENDENCIES) stamp-pic
+ $(libaxvlc_a_DEPENDENCIES)
$(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
- -Wl,--enable-stdcall-fixup $(srcdir)/axvlc.def \
- $(LIBRARIES_libvlc) -shared $(LDFLAGS_activex)
+ $(srcdir)/axvlc.def \
+ $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LDFLAGS_activex) \
+ $(INCLUDED_LIBINTL)
+# Cygwin work-around
+ @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
DATA_axvlc_tlb = $(axvlc_tlb_DATA)
clean-tlb:
rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h
+else
+if HAS_WIDL_COMPILER
+
+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
+
+clean-tlb:
+ rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h
+
else
clean-tlb:
+endif
endif
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 $@
+ $(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
endif
-###############################################################################
-# Stamp rules
-###############################################################################
-
-clean-stamp:
- rm -f stamp-pic
-
-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
-
###############################################################################
# Clean rules
###############################################################################
-clean-local: clean-stamp clean-tlb
+clean-local: clean-tlb
rm -f axvlc$(LIBEXT)
###############################################################################
-# Force rule
+# Force rules
###############################################################################
-FORCE: