AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regenerated make/project files after applying mediactrl patch (1427775)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-02-10 20:02:55 +00:00
parent 77a7dfc1a1
commit 0604740afd
12 changed files with 283 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
Makefile.in
View File

@ -4474,10 +4474,12 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS = \
@COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS = \
@COND_TOOLKIT_MSW@ monodll_mediactrl.o monodll_activex.o
@COND_TOOLKIT_MSW@ monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \
@COND_TOOLKIT_MSW@ monodll_activex.o
@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS =
@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS = \
@COND_TOOLKIT_WINCE@ monodll_mediactrl.o monodll_activex.o
@COND_TOOLKIT_WINCE@ monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \
@COND_TOOLKIT_WINCE@ monodll_activex.o
@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
@ -6092,10 +6094,12 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 = \
@COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
@COND_TOOLKIT_MSW@ monolib_mediactrl.o monolib_activex.o
@COND_TOOLKIT_MSW@ monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \
@COND_TOOLKIT_MSW@ monolib_activex.o
@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_1 =
@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
@COND_TOOLKIT_WINCE@ monolib_mediactrl.o monolib_activex.o
@COND_TOOLKIT_WINCE@ monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \
@COND_TOOLKIT_WINCE@ monolib_activex.o
@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
@ -9372,11 +9376,11 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 = \
@COND_TOOLKIT_WINCE@ = advlib_datectrl.o
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advlib_sound_sdl.o
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___mediadll___depname = \
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname = \
$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___mediadll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_mediadll___depname \
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_mediadll
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__install_mediadll___depname \
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ = install_mediadll
COND_PLATFORM_MACOSX_1___mediadll___macinstnamecmd = -install_name \
$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@COND_PLATFORM_MACOSX_1@__mediadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___mediadll___macinstnamecmd)
@ -9423,16 +9427,18 @@ COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_inst_cmd = rm -f \
@COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
@COND_TOOLKIT_MSW@ mediadll_mediactrl.o mediadll_activex.o
@COND_TOOLKIT_MSW@ mediadll_mediactrl_am.o mediadll_mediactrl_wmp10.o \
@COND_TOOLKIT_MSW@ mediadll_activex.o
@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_2 =
@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
@COND_TOOLKIT_WINCE@ mediadll_mediactrl.o mediadll_activex.o
@COND_TOOLKIT_WINCE@ mediadll_mediactrl_am.o mediadll_mediactrl_wmp10.o \
@COND_TOOLKIT_WINCE@ mediadll_activex.o
@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___medialib___depname = \
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__medialib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___medialib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_medialib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_medialib
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@__medialib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@__install_medialib___depname \
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ = install_medialib
@COND_GCC_PCH_1@__medialib_PCH_INC = -I.pch/wxprec_medialib
@COND_ICC_PCH_1@__medialib_PCH_INC = -use_pch \
@COND_ICC_PCH_1@ .pch/wxprec_medialib/wx/wxprec.h.gch
@ -9443,10 +9449,12 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___medialib___depname = \
@COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
@COND_TOOLKIT_MSW@ medialib_mediactrl.o medialib_activex.o
@COND_TOOLKIT_MSW@ medialib_mediactrl_am.o medialib_mediactrl_wmp10.o \
@COND_TOOLKIT_MSW@ medialib_activex.o
@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_3 =
@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
@COND_TOOLKIT_WINCE@ medialib_mediactrl.o medialib_activex.o
@COND_TOOLKIT_WINCE@ medialib_mediactrl_am.o medialib_mediactrl_wmp10.o \
@COND_TOOLKIT_WINCE@ medialib_activex.o
@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \
$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@ -10416,28 +10424,28 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_advlib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MEDIADLL_OBJECTS) $(__mediadll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__mediadll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MEDIADLL_OBJECTS) $(__mediadll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(__mediadll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_mediadll:
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd))
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@install_mediadll:
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_mediadll/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_mediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIADLL_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MEDIALIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(MEDIALIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MEDIALIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ rm -f $@
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ $(AR) rcu $@ $(MEDIALIB_OBJECTS)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ $(RANLIB) $@
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_medialib:
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@install_medialib:
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
@COND_USE_PCH_1@.pch/wxprec_medialib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_medialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
@ -14823,11 +14831,23 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_MAC_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/mac/carbon/mediactrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/mediactrl.cpp
@ -14844,12 +14864,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP)
@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
@ -18588,11 +18602,23 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_MAC_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/mac/carbon/mediactrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/mediactrl.cpp
@ -18609,12 +18635,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
@ -25707,11 +25727,23 @@ mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP)
mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
$(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
@COND_TOOLKIT_MSW@mediadll_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl.cpp
@COND_TOOLKIT_MSW@mediadll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
@COND_TOOLKIT_WINCE@mediadll_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl.cpp
@COND_TOOLKIT_WINCE@mediadll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
@COND_TOOLKIT_MSW@mediadll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
@COND_TOOLKIT_WINCE@mediadll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
@COND_TOOLKIT_MSW@mediadll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_WINCE@mediadll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_MAC@mediadll_mediactrl.o: $(srcdir)/src/mac/carbon/mediactrl.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/mac/carbon/mediactrl.cpp
@ -25728,20 +25760,26 @@ mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_X11@mediadll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@COND_TOOLKIT_MSW@mediadll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_WINCE@mediadll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
$(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
@COND_TOOLKIT_MSW@medialib_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl.cpp
@COND_TOOLKIT_MSW@medialib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
@COND_TOOLKIT_WINCE@medialib_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl.cpp
@COND_TOOLKIT_WINCE@medialib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
@COND_TOOLKIT_MSW@medialib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
@COND_TOOLKIT_WINCE@medialib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
@COND_TOOLKIT_MSW@medialib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_WINCE@medialib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_MAC@medialib_mediactrl.o: $(srcdir)/src/mac/carbon/mediactrl.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/mac/carbon/mediactrl.cpp
@ -25758,12 +25796,6 @@ medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_X11@medialib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@COND_TOOLKIT_MSW@medialib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@COND_TOOLKIT_WINCE@medialib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
odbcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ODBCDLL_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

12
autoconf_inc.m4
View File

@ -128,6 +128,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1[wx.bkl] #
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_MEDIA" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
@ -170,6 +176,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1[wx.bkl] #
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_MEDIA" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then

5
build/msw/config.bcc
View File

@ -98,6 +98,11 @@ USE_GUI = 1
USE_HTML = 1
!endif
# Build multimedia library (USE_GUI must be 1)? [0,1]
!ifndef USE_MEDIA
USE_MEDIA = 1
!endif
# Build wxXRC library (USE_GUI must be 1)? [0,1]
!ifndef USE_XRC
USE_XRC = 1

3
build/msw/config.gcc
View File

@ -64,6 +64,9 @@ USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build multimedia library (USE_GUI must be 1)? [0,1]
USE_MEDIA = 1
# Build wxXRC library (USE_GUI must be 1)? [0,1]
USE_XRC = 1

3
build/msw/config.vc
View File

@ -75,6 +75,9 @@ USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build multimedia library (USE_GUI must be 1)? [0,1]
USE_MEDIA = 1
# Build wxXRC library (USE_GUI must be 1)? [0,1]
USE_XRC = 1

3
build/msw/config.wat
View File

@ -68,6 +68,9 @@ USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build multimedia library (USE_GUI must be 1)? [0,1]
USE_MEDIA = 1
# Build wxXRC library (USE_GUI must be 1)? [0,1]
USE_XRC = 1

43
build/msw/makefile.bcc
View File

@ -27,7 +27,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \
-DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
-DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
-DUSE_HTML="$(USE_HTML)" -DUSE_XRC="$(USE_XRC)" \
-DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
-DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \
-DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
-DUSE_THREADS="$(USE_THREADS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
@ -699,7 +699,8 @@ MEDIADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
MEDIADLL_OBJECTS = \
$(OBJS)\mediadll_dummy.obj \
$(OBJS)\mediadll_mediactrlcmn.obj \
$(OBJS)\mediadll_mediactrl.obj \
$(OBJS)\mediadll_mediactrl_am.obj \
$(OBJS)\mediadll_mediactrl_wmp10.obj \
$(OBJS)\mediadll_activex.obj
MEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@ -711,7 +712,8 @@ MEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
MEDIALIB_OBJECTS = \
$(OBJS)\medialib_dummy.obj \
$(OBJS)\medialib_mediactrlcmn.obj \
$(OBJS)\medialib_mediactrl.obj \
$(OBJS)\medialib_mediactrl_am.obj \
$(OBJS)\medialib_mediactrl_wmp10.obj \
$(OBJS)\medialib_activex.obj
ODBCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@ -1061,7 +1063,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(____CORE_SRC_FILENAMES_OBJECTS) \
$(____ADVANCED_SRC_FILENAMES_OBJECTS) \
$(OBJS)\monodll_mediactrlcmn.obj \
$(OBJS)\monodll_mediactrl.obj \
$(OBJS)\monodll_mediactrl_am.obj \
$(OBJS)\monodll_mediactrl_wmp10.obj \
$(OBJS)\monodll_activex.obj \
$(OBJS)\monodll_helpbest.obj \
$(OBJS)\monodll_helpctrl.obj \
@ -1593,7 +1596,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(____CORE_SRC_FILENAMES_1_OBJECTS) \
$(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
$(OBJS)\monolib_mediactrlcmn.obj \
$(OBJS)\monolib_mediactrl.obj \
$(OBJS)\monolib_mediactrl_am.obj \
$(OBJS)\monolib_mediactrl_wmp10.obj \
$(OBJS)\monolib_activex.obj \
$(OBJS)\monolib_helpbest.obj \
$(OBJS)\monolib_helpctrl.obj \
@ -3040,11 +3044,11 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_taskbar.obj \
$(OBJS)\advlib_joystick.obj
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
__mediadll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
__medialib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
!endif
@ -3477,7 +3481,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\mediadll_version.res
@ -3485,7 +3489,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media $@
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib: $(OBJS)\medialib_dummy.obj $(MEDIALIB_OBJECTS)
if exist $@ del $@
tlib /a /p4096 $@ @&&|
@ -3652,6 +3656,7 @@ build_cfg_file: $(SETUPHDIR)
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
@echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
@ -4428,7 +4433,10 @@ $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
@ -6168,7 +6176,10 @@ $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
@ -10500,7 +10511,10 @@ $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
$(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $**
$(OBJS)\mediadll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $**
$(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $**
$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
@ -10512,7 +10526,10 @@ $(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $**
$(OBJS)\medialib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $**
$(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $**
$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp

52
build/msw/makefile.gcc
View File

@ -17,11 +17,12 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
USE_QA="$(USE_QA)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
USE_RTTI="$(USE_RTTI)" USE_THREADS="$(USE_THREADS)" \
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" \
USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \
WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
CPPDEPS = -MT$@ -MF$@.d -MD
@ -690,7 +691,8 @@ MEDIADLL_OBJECTS = \
$(OBJS)\mediadll_dummy.o \
$(OBJS)\mediadll_version_rc.o \
$(OBJS)\mediadll_mediactrlcmn.o \
$(OBJS)\mediadll_mediactrl.o \
$(OBJS)\mediadll_mediactrl_am.o \
$(OBJS)\mediadll_mediactrl_wmp10.o \
$(OBJS)\mediadll_activex.o
MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@ -703,7 +705,8 @@ MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
MEDIALIB_OBJECTS = \
$(OBJS)\medialib_dummy.o \
$(OBJS)\medialib_mediactrlcmn.o \
$(OBJS)\medialib_mediactrl.o \
$(OBJS)\medialib_mediactrl_am.o \
$(OBJS)\medialib_mediactrl_wmp10.o \
$(OBJS)\medialib_activex.o
ODBCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@ -1070,7 +1073,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(____CORE_SRC_FILENAMES_OBJECTS) \
$(____ADVANCED_SRC_FILENAMES_OBJECTS) \
$(OBJS)\monodll_mediactrlcmn.o \
$(OBJS)\monodll_mediactrl.o \
$(OBJS)\monodll_mediactrl_am.o \
$(OBJS)\monodll_mediactrl_wmp10.o \
$(OBJS)\monodll_activex.o \
$(OBJS)\monodll_helpbest.o \
$(OBJS)\monodll_helpctrl.o \
@ -1608,7 +1612,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(____CORE_SRC_FILENAMES_1_OBJECTS) \
$(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
$(OBJS)\monolib_mediactrlcmn.o \
$(OBJS)\monolib_mediactrl.o \
$(OBJS)\monolib_mediactrl_am.o \
$(OBJS)\monolib_mediactrl_wmp10.o \
$(OBJS)\monolib_activex.o \
$(OBJS)\monolib_helpbest.o \
$(OBJS)\monolib_helpctrl.o \
@ -3094,19 +3099,23 @@ endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)
ifeq ($(USE_MEDIA),1)
__mediadll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll
endif
endif
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0)
ifeq ($(USE_GUI),1)
ifeq ($(USE_MEDIA),1)
__medialib___depname = \
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a
endif
endif
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_ODBC),1)
@ -3538,15 +3547,18 @@ endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)
ifeq ($(USE_MEDIA),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname)
$(CXX) -shared -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
endif
endif
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0)
ifeq ($(USE_GUI),1)
ifeq ($(USE_MEDIA),1)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a: $(MEDIALIB_OBJECTS)
if exist $@ del $@
ar rcu $@ $(MEDIALIB_OBJECTS)
@ -3554,6 +3566,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
endif
endif
endif
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
@ -3747,6 +3760,7 @@ build_cfg_file: $(SETUPHDIR)
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
@echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
@ -4523,7 +4537,10 @@ $(OBJS)\monodll_datectrl.o: ../../src/msw/datectrl.cpp
$(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_mediactrl.o: ../../src/msw/mediactrl.cpp
$(OBJS)\monodll_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_activex.o: ../../src/msw/ole/activex.cpp
@ -6363,7 +6380,10 @@ $(OBJS)\monolib_datectrl.o: ../../src/msw/datectrl.cpp
$(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_mediactrl.o: ../../src/msw/mediactrl.cpp
$(OBJS)\monolib_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_activex.o: ../../src/msw/ole/activex.cpp
@ -10995,7 +11015,10 @@ $(OBJS)\mediadll_version_rc.o: ../../src/msw/version.rc
$(OBJS)\mediadll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
$(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mediadll_mediactrl.o: ../../src/msw/mediactrl.cpp
$(OBJS)\mediadll_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp
$(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mediadll_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
$(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mediadll_activex.o: ../../src/msw/ole/activex.cpp
@ -11007,7 +11030,10 @@ $(OBJS)\medialib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\medialib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
$(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\medialib_mediactrl.o: ../../src/msw/mediactrl.cpp
$(OBJS)\medialib_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp
$(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\medialib_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
$(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\medialib_activex.o: ../../src/msw/ole/activex.cpp

52
build/msw/makefile.vc
View File

@ -18,11 +18,12 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
USE_QA="$(USE_QA)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
USE_RTTI="$(USE_RTTI)" USE_THREADS="$(USE_THREADS)" \
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" \
USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \
WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 27
@ -739,7 +740,8 @@ MEDIADLL_OBJECTS = \
$(OBJS)\mediadll_dummy.obj \
$(OBJS)\mediadll_version.res \
$(OBJS)\mediadll_mediactrlcmn.obj \
$(OBJS)\mediadll_mediactrl.obj \
$(OBJS)\mediadll_mediactrl_am.obj \
$(OBJS)\mediadll_mediactrl_wmp10.obj \
$(OBJS)\mediadll_activex.obj
MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) \
@ -754,7 +756,8 @@ MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \
MEDIALIB_OBJECTS = \
$(OBJS)\medialib_dummy.obj \
$(OBJS)\medialib_mediactrlcmn.obj \
$(OBJS)\medialib_mediactrl.obj \
$(OBJS)\medialib_mediactrl_am.obj \
$(OBJS)\medialib_mediactrl_wmp10.obj \
$(OBJS)\medialib_activex.obj
ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_249)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) \
@ -1219,7 +1222,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(____CORE_SRC_FILENAMES_OBJECTS) \
$(____ADVANCED_SRC_FILENAMES_OBJECTS) \
$(OBJS)\monodll_mediactrlcmn.obj \
$(OBJS)\monodll_mediactrl.obj \
$(OBJS)\monodll_mediactrl_am.obj \
$(OBJS)\monodll_mediactrl_wmp10.obj \
$(OBJS)\monodll_activex.obj \
$(OBJS)\monodll_helpbest.obj \
$(OBJS)\monodll_helpctrl.obj \
@ -1757,7 +1761,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(____CORE_SRC_FILENAMES_1_OBJECTS) \
$(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
$(OBJS)\monolib_mediactrlcmn.obj \
$(OBJS)\monolib_mediactrl.obj \
$(OBJS)\monolib_mediactrl_am.obj \
$(OBJS)\monolib_mediactrl_wmp10.obj \
$(OBJS)\monolib_activex.obj \
$(OBJS)\monolib_helpbest.obj \
$(OBJS)\monolib_helpctrl.obj \
@ -3252,7 +3257,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_taskbar.obj \
$(OBJS)\advlib_joystick.obj
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
__mediadll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
!endif
@ -3262,7 +3267,7 @@ __RUNTIME_LIBS_222 = D
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_222 = $(__THREADSFLAG)
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
__medialib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
!endif
@ -3794,14 +3799,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(MEDIADLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
<<
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib: $(OBJS)\medialib_dummy.obj $(MEDIALIB_OBJECTS)
if exist $@ del $@
link /LIB /NOLOGO /OUT:$@ @<<
@ -3960,6 +3965,7 @@ build_cfg_file: $(SETUPHDIR)
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
@echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
@ -4736,7 +4742,10 @@ $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
@ -6476,7 +6485,10 @@ $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
@ -10808,7 +10820,10 @@ $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
$(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
$(OBJS)\mediadll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
$(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
@ -10820,7 +10835,10 @@ $(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
$(OBJS)\medialib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
$(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp

52
build/msw/makefile.wat
View File

@ -101,7 +101,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(____CORE_SRC_FILENAMES_OBJECTS) &
$(____ADVANCED_SRC_FILENAMES_OBJECTS) &
$(OBJS)\monodll_mediactrlcmn.obj &
$(OBJS)\monodll_mediactrl.obj &
$(OBJS)\monodll_mediactrl_am.obj &
$(OBJS)\monodll_mediactrl_wmp10.obj &
$(OBJS)\monodll_activex.obj &
$(OBJS)\monodll_helpbest.obj &
$(OBJS)\monodll_helpctrl.obj &
@ -643,7 +644,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(____CORE_SRC_FILENAMES_1_OBJECTS) &
$(____ADVANCED_SRC_FILENAMES_1_OBJECTS) &
$(OBJS)\monolib_mediactrlcmn.obj &
$(OBJS)\monolib_mediactrl.obj &
$(OBJS)\monolib_mediactrl_am.obj &
$(OBJS)\monolib_mediactrl_wmp10.obj &
$(OBJS)\monolib_activex.obj &
$(OBJS)\monolib_helpbest.obj &
$(OBJS)\monolib_helpctrl.obj &
@ -2144,20 +2146,24 @@ __mediadll___depname =
!ifeq MONOLITHIC 0
!ifeq SHARED 1
!ifeq USE_GUI 1
!ifeq USE_MEDIA 1
__mediadll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_wat$(VENDORTAG).dll
!endif
!endif
!endif
!endif
__medialib___depname =
!ifeq MONOLITHIC 0
!ifeq SHARED 0
!ifeq USE_GUI 1
!ifeq USE_MEDIA 1
__medialib___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
!endif
!endif
!endif
!endif
__odbcdll___depname =
!ifeq MONOLITHIC 0
!ifeq SHARED 1
@ -2432,11 +2438,12 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" &
USE_QA="$(USE_QA)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" &
USE_RTTI="$(USE_RTTI)" USE_THREADS="$(USE_THREADS)" &
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" &
USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" &
WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
RUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 27
@ -3102,7 +3109,8 @@ MEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
MEDIADLL_OBJECTS = &
$(OBJS)\mediadll_dummy.obj &
$(OBJS)\mediadll_mediactrlcmn.obj &
$(OBJS)\mediadll_mediactrl.obj &
$(OBJS)\mediadll_mediactrl_am.obj &
$(OBJS)\mediadll_mediactrl_wmp10.obj &
$(OBJS)\mediadll_activex.obj
MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
@ -3115,7 +3123,8 @@ MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
MEDIALIB_OBJECTS = &
$(OBJS)\medialib_dummy.obj &
$(OBJS)\medialib_mediactrlcmn.obj &
$(OBJS)\medialib_mediactrl.obj &
$(OBJS)\medialib_mediactrl_am.obj &
$(OBJS)\medialib_mediactrl_wmp10.obj &
$(OBJS)\medialib_activex.obj
ODBCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
@ -3656,6 +3665,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!ifeq MONOLITHIC 0
!ifeq SHARED 1
!ifeq USE_GUI 1
!ifeq USE_MEDIA 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_wat$(VENDORTAG).dll : $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
@%create $(OBJS)\mediadll.lbc
@%append $(OBJS)\mediadll.lbc option quiet
@ -3671,10 +3681,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
!endif
!endif
!endif
!ifeq MONOLITHIC 0
!ifeq SHARED 0
!ifeq USE_GUI 1
!ifeq USE_MEDIA 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib : $(MEDIALIB_OBJECTS)
@%create $(OBJS)\medialib.lbc
@for %i in ($(MEDIALIB_OBJECTS)) do @%append $(OBJS)\medialib.lbc +%i
@ -3682,6 +3694,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
!endif
!endif
!endif
!ifeq MONOLITHIC 0
!ifeq SHARED 1
@ -3947,6 +3960,7 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
@echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
@ -4723,7 +4737,10 @@ $(OBJS)\monodll_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp
$(OBJS)\monodll_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_mediactrl.obj : .AUTODEPEND ..\..\src\msw\mediactrl.cpp
$(OBJS)\monodll_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
@ -6563,7 +6580,10 @@ $(OBJS)\monolib_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp
$(OBJS)\monolib_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_mediactrl.obj : .AUTODEPEND ..\..\src\msw\mediactrl.cpp
$(OBJS)\monolib_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
@ -11195,7 +11215,10 @@ $(OBJS)\mediadll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
$(OBJS)\mediadll_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<
$(OBJS)\mediadll_mediactrl.obj : .AUTODEPEND ..\..\src\msw\mediactrl.cpp
$(OBJS)\mediadll_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<
$(OBJS)\mediadll_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<
$(OBJS)\mediadll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
@ -11207,7 +11230,10 @@ $(OBJS)\medialib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\medialib_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
$(OBJS)\medialib_mediactrl.obj : .AUTODEPEND ..\..\src\msw\mediactrl.cpp
$(OBJS)\medialib_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
$(OBJS)\medialib_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
$(OBJS)\medialib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp

6
build/msw/wx_media.dsp
View File

@ -470,7 +470,11 @@ SOURCE=..\..\src\msw\dummy.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\mediactrl.cpp
SOURCE=..\..\src\msw\mediactrl_am.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\mediactrl_wmp10.cpp
# End Source File
# Begin Source File

6
src/wxWindows.dsp
View File

@ -1411,7 +1411,11 @@ SOURCE=.\msw\mdi.cpp
# End Source File
# Begin Source File
SOURCE=.\msw\mediactrl.cpp
SOURCE=.\msw\mediactrl_am.cpp
# End Source File
# Begin Source File
SOURCE=.\msw\mediactrl_wmp10.cpp
# End Source File
# Begin Source File