Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

export wxActiveX stuff from core (not media) DLL (closes #8991)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-16 17:44:16 +00:00
parent 68888eeaa8
commit 213b5041fe
22 changed files with 292 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/bakefiles/files.bkl
View File

@@ -1656,6 +1656,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/nativewin.cpp
src/msw/notebook.cpp
src/msw/ole/access.cpp
src/msw/ole/activex.cpp
src/msw/ownerdrw.cpp
src/msw/radiobox.cpp
src/msw/radiobut.cpp
@@ -1728,6 +1729,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/msvcrt.h
wx/msw/notebook.h
wx/msw/ole/access.h
wx/msw/ole/activex.h
wx/msw/ole/dataform.h
wx/msw/ole/dataobj.h
wx/msw/ole/dataobj2.h
@@ -3114,10 +3116,8 @@ src/osx/iphone/window.mm
src/msw/mediactrl_am.cpp
src/msw/mediactrl_wmp10.cpp
src/msw/mediactrl_qt.cpp
src/msw/ole/activex.cpp
</set>
<set var="MEDIA_MSW_HDR" hints="files">
wx/msw/ole/activex.h
</set>
<!-- not built on WindowsCE: -->
<set var="MEDIA_MSW_DESKTOP_SRC" hints="files">

36
build/msw/makefile.bcc
View File

@@ -919,8 +919,7 @@ MEDIADLL_OBJECTS = \
$(OBJS)\mediadll_mediactrlcmn.obj \
$(OBJS)\mediadll_mediactrl_am.obj \
$(OBJS)\mediadll_mediactrl_wmp10.obj \
$(OBJS)\mediadll_mediactrl_qt.obj \
$(OBJS)\mediadll_activex.obj
$(OBJS)\mediadll_mediactrl_qt.obj
MEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -934,8 +933,7 @@ MEDIALIB_OBJECTS = \
$(OBJS)\medialib_mediactrlcmn.obj \
$(OBJS)\medialib_mediactrl_am.obj \
$(OBJS)\medialib_mediactrl_wmp10.obj \
$(OBJS)\medialib_mediactrl_qt.obj \
$(OBJS)\medialib_activex.obj
$(OBJS)\medialib_mediactrl_qt.obj
HTMLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1411,7 +1409,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_mediactrl_am.obj \
$(OBJS)\monodll_mediactrl_wmp10.obj \
$(OBJS)\monodll_mediactrl_qt.obj \
$(OBJS)\monodll_activex.obj \
$(OBJS)\monodll_helpbest.obj \
$(OBJS)\monodll_helpctrl.obj \
$(OBJS)\monodll_helpdata.obj \
@@ -1608,6 +1605,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_nativewin.obj \
$(OBJS)\monodll_notebook.obj \
$(OBJS)\monodll_access.obj \
$(OBJS)\monodll_activex.obj \
$(OBJS)\monodll_ownerdrw.obj \
$(OBJS)\monodll_radiobox.obj \
$(OBJS)\monodll_radiobut.obj \
@@ -2092,7 +2090,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_mediactrl_am.obj \
$(OBJS)\monolib_mediactrl_wmp10.obj \
$(OBJS)\monolib_mediactrl_qt.obj \
$(OBJS)\monolib_activex.obj \
$(OBJS)\monolib_helpbest.obj \
$(OBJS)\monolib_helpctrl.obj \
$(OBJS)\monolib_helpdata.obj \
@@ -2289,6 +2286,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_nativewin.obj \
$(OBJS)\monolib_notebook.obj \
$(OBJS)\monolib_access.obj \
$(OBJS)\monolib_activex.obj \
$(OBJS)\monolib_ownerdrw.obj \
$(OBJS)\monolib_radiobox.obj \
$(OBJS)\monolib_radiobut.obj \
@@ -2875,6 +2873,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_nativewin.obj \
$(OBJS)\coredll_notebook.obj \
$(OBJS)\coredll_access.obj \
$(OBJS)\coredll_activex.obj \
$(OBJS)\coredll_ownerdrw.obj \
$(OBJS)\coredll_radiobox.obj \
$(OBJS)\coredll_radiobut.obj \
@@ -3358,6 +3357,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_nativewin.obj \
$(OBJS)\corelib_notebook.obj \
$(OBJS)\corelib_access.obj \
$(OBJS)\corelib_activex.obj \
$(OBJS)\corelib_ownerdrw.obj \
$(OBJS)\corelib_radiobox.obj \
$(OBJS)\corelib_radiobut.obj \
@@ -5783,6 +5783,9 @@ $(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
$(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
@@ -5888,9 +5891,6 @@ $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
@@ -8003,6 +8003,9 @@ $(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
$(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
@@ -8108,9 +8111,6 @@ $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp
@@ -10607,6 +10607,9 @@ $(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
$(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
@@ -11978,6 +11981,9 @@ $(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
$(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
@@ -13527,9 +13533,6 @@ $(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -13545,9 +13548,6 @@ $(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp

36
build/msw/makefile.gcc
View File

@@ -915,8 +915,7 @@ MEDIADLL_OBJECTS = \
$(OBJS)\mediadll_mediactrlcmn.o \
$(OBJS)\mediadll_mediactrl_am.o \
$(OBJS)\mediadll_mediactrl_wmp10.o \
$(OBJS)\mediadll_mediactrl_qt.o \
$(OBJS)\mediadll_activex.o
$(OBJS)\mediadll_mediactrl_qt.o
MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -930,8 +929,7 @@ MEDIALIB_OBJECTS = \
$(OBJS)\medialib_mediactrlcmn.o \
$(OBJS)\medialib_mediactrl_am.o \
$(OBJS)\medialib_mediactrl_wmp10.o \
$(OBJS)\medialib_mediactrl_qt.o \
$(OBJS)\medialib_activex.o
$(OBJS)\medialib_mediactrl_qt.o
HTMLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1428,7 +1426,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_mediactrl_am.o \
$(OBJS)\monodll_mediactrl_wmp10.o \
$(OBJS)\monodll_mediactrl_qt.o \
$(OBJS)\monodll_activex.o \
$(OBJS)\monodll_helpbest.o \
$(OBJS)\monodll_helpctrl.o \
$(OBJS)\monodll_helpdata.o \
@@ -1626,6 +1623,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_nativewin.o \
$(OBJS)\monodll_notebook.o \
$(OBJS)\monodll_access.o \
$(OBJS)\monodll_activex.o \
$(OBJS)\monodll_ownerdrw.o \
$(OBJS)\monodll_radiobox.o \
$(OBJS)\monodll_radiobut.o \
@@ -2115,7 +2113,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_mediactrl_am.o \
$(OBJS)\monolib_mediactrl_wmp10.o \
$(OBJS)\monolib_mediactrl_qt.o \
$(OBJS)\monolib_activex.o \
$(OBJS)\monolib_helpbest.o \
$(OBJS)\monolib_helpctrl.o \
$(OBJS)\monolib_helpdata.o \
@@ -2313,6 +2310,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_nativewin.o \
$(OBJS)\monolib_notebook.o \
$(OBJS)\monolib_access.o \
$(OBJS)\monolib_activex.o \
$(OBJS)\monolib_ownerdrw.o \
$(OBJS)\monolib_radiobox.o \
$(OBJS)\monolib_radiobut.o \
@@ -2915,6 +2913,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_nativewin.o \
$(OBJS)\coredll_notebook.o \
$(OBJS)\coredll_access.o \
$(OBJS)\coredll_activex.o \
$(OBJS)\coredll_ownerdrw.o \
$(OBJS)\coredll_radiobox.o \
$(OBJS)\coredll_radiobut.o \
@@ -3406,6 +3405,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_nativewin.o \
$(OBJS)\corelib_notebook.o \
$(OBJS)\corelib_access.o \
$(OBJS)\corelib_activex.o \
$(OBJS)\corelib_ownerdrw.o \
$(OBJS)\corelib_radiobox.o \
$(OBJS)\corelib_radiobut.o \
@@ -5935,6 +5935,9 @@ $(OBJS)\monodll_nativewin.o: ../../src/msw/nativewin.cpp
$(OBJS)\monodll_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -6040,9 +6043,6 @@ $(OBJS)\monodll_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
$(OBJS)\monodll_mediactrl_qt.o: ../../src/msw/mediactrl_qt.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_helpbest.o: ../../src/msw/helpbest.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8269,6 +8269,9 @@ $(OBJS)\monolib_nativewin.o: ../../src/msw/nativewin.cpp
$(OBJS)\monolib_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -8374,9 +8377,6 @@ $(OBJS)\monolib_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
$(OBJS)\monolib_mediactrl_qt.o: ../../src/msw/mediactrl_qt.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_helpbest.o: ../../src/msw/helpbest.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10987,6 +10987,9 @@ $(OBJS)\coredll_nativewin.o: ../../src/msw/nativewin.cpp
$(OBJS)\coredll_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -12470,6 +12473,9 @@ $(OBJS)\corelib_nativewin.o: ../../src/msw/nativewin.cpp
$(OBJS)\corelib_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14131,9 +14137,6 @@ $(OBJS)\mediadll_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
$(OBJS)\mediadll_mediactrl_qt.o: ../../src/msw/mediactrl_qt.cpp
$(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mediadll_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\medialib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14149,9 +14152,6 @@ $(OBJS)\medialib_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
$(OBJS)\medialib_mediactrl_qt.o: ../../src/msw/mediactrl_qt.cpp
$(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\medialib_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmldll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<

36
build/msw/makefile.vc
View File

@@ -961,8 +961,7 @@ MEDIADLL_OBJECTS = \
$(OBJS)\mediadll_mediactrlcmn.obj \
$(OBJS)\mediadll_mediactrl_am.obj \
$(OBJS)\mediadll_mediactrl_wmp10.obj \
$(OBJS)\mediadll_mediactrl_qt.obj \
$(OBJS)\mediadll_activex.obj
$(OBJS)\mediadll_mediactrl_qt.obj
MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_248)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
@@ -979,8 +978,7 @@ MEDIALIB_OBJECTS = \
$(OBJS)\medialib_mediactrlcmn.obj \
$(OBJS)\medialib_mediactrl_am.obj \
$(OBJS)\medialib_mediactrl_wmp10.obj \
$(OBJS)\medialib_mediactrl_qt.obj \
$(OBJS)\medialib_activex.obj
$(OBJS)\medialib_mediactrl_qt.obj
HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
@@ -1591,7 +1589,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_mediactrl_am.obj \
$(OBJS)\monodll_mediactrl_wmp10.obj \
$(OBJS)\monodll_mediactrl_qt.obj \
$(OBJS)\monodll_activex.obj \
$(OBJS)\monodll_helpbest.obj \
$(OBJS)\monodll_helpctrl.obj \
$(OBJS)\monodll_helpdata.obj \
@@ -1788,6 +1785,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_nativewin.obj \
$(OBJS)\monodll_notebook.obj \
$(OBJS)\monodll_access.obj \
$(OBJS)\monodll_activex.obj \
$(OBJS)\monodll_ownerdrw.obj \
$(OBJS)\monodll_radiobox.obj \
$(OBJS)\monodll_radiobut.obj \
@@ -2278,7 +2276,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_mediactrl_am.obj \
$(OBJS)\monolib_mediactrl_wmp10.obj \
$(OBJS)\monolib_mediactrl_qt.obj \
$(OBJS)\monolib_activex.obj \
$(OBJS)\monolib_helpbest.obj \
$(OBJS)\monolib_helpctrl.obj \
$(OBJS)\monolib_helpdata.obj \
@@ -2475,6 +2472,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_nativewin.obj \
$(OBJS)\monolib_notebook.obj \
$(OBJS)\monolib_access.obj \
$(OBJS)\monolib_activex.obj \
$(OBJS)\monolib_ownerdrw.obj \
$(OBJS)\monolib_radiobox.obj \
$(OBJS)\monolib_radiobut.obj \
@@ -3091,6 +3089,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_nativewin.obj \
$(OBJS)\coredll_notebook.obj \
$(OBJS)\coredll_access.obj \
$(OBJS)\coredll_activex.obj \
$(OBJS)\coredll_ownerdrw.obj \
$(OBJS)\coredll_radiobox.obj \
$(OBJS)\coredll_radiobut.obj \
@@ -3580,6 +3579,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_nativewin.obj \
$(OBJS)\corelib_notebook.obj \
$(OBJS)\corelib_access.obj \
$(OBJS)\corelib_activex.obj \
$(OBJS)\corelib_ownerdrw.obj \
$(OBJS)\corelib_radiobox.obj \
$(OBJS)\corelib_radiobut.obj \
@@ -6129,6 +6129,9 @@ $(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
$(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
@@ -6234,9 +6237,6 @@ $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
@@ -8349,6 +8349,9 @@ $(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
$(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
@@ -8454,9 +8457,6 @@ $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp
@@ -10953,6 +10953,9 @@ $(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
$(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
@@ -12324,6 +12327,9 @@ $(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
$(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
@@ -13873,9 +13879,6 @@ $(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@@ -13891,9 +13894,6 @@ $(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
$(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

36
build/msw/makefile.wat
View File

@@ -104,7 +104,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_mediactrl_am.obj &
$(OBJS)\monodll_mediactrl_wmp10.obj &
$(OBJS)\monodll_mediactrl_qt.obj &
$(OBJS)\monodll_activex.obj &
$(OBJS)\monodll_helpbest.obj &
$(OBJS)\monodll_helpctrl.obj &
$(OBJS)\monodll_helpdata.obj &
@@ -303,6 +302,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_nativewin.obj &
$(OBJS)\monodll_notebook.obj &
$(OBJS)\monodll_access.obj &
$(OBJS)\monodll_activex.obj &
$(OBJS)\monodll_ownerdrw.obj &
$(OBJS)\monodll_radiobox.obj &
$(OBJS)\monodll_radiobut.obj &
@@ -796,7 +796,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_mediactrl_am.obj &
$(OBJS)\monolib_mediactrl_wmp10.obj &
$(OBJS)\monolib_mediactrl_qt.obj &
$(OBJS)\monolib_activex.obj &
$(OBJS)\monolib_helpbest.obj &
$(OBJS)\monolib_helpctrl.obj &
$(OBJS)\monolib_helpdata.obj &
@@ -995,6 +994,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_nativewin.obj &
$(OBJS)\monolib_notebook.obj &
$(OBJS)\monolib_access.obj &
$(OBJS)\monolib_activex.obj &
$(OBJS)\monolib_ownerdrw.obj &
$(OBJS)\monolib_radiobox.obj &
$(OBJS)\monolib_radiobut.obj &
@@ -1608,6 +1608,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_nativewin.obj &
$(OBJS)\coredll_notebook.obj &
$(OBJS)\coredll_access.obj &
$(OBJS)\coredll_activex.obj &
$(OBJS)\coredll_ownerdrw.obj &
$(OBJS)\coredll_radiobox.obj &
$(OBJS)\coredll_radiobut.obj &
@@ -2101,6 +2102,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_nativewin.obj &
$(OBJS)\corelib_notebook.obj &
$(OBJS)\corelib_access.obj &
$(OBJS)\corelib_activex.obj &
$(OBJS)\corelib_ownerdrw.obj &
$(OBJS)\corelib_radiobox.obj &
$(OBJS)\corelib_radiobut.obj &
@@ -4018,8 +4020,7 @@ MEDIADLL_OBJECTS = &
$(OBJS)\mediadll_mediactrlcmn.obj &
$(OBJS)\mediadll_mediactrl_am.obj &
$(OBJS)\mediadll_mediactrl_wmp10.obj &
$(OBJS)\mediadll_mediactrl_qt.obj &
$(OBJS)\mediadll_activex.obj
$(OBJS)\mediadll_mediactrl_qt.obj
MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -4033,8 +4034,7 @@ MEDIALIB_OBJECTS = &
$(OBJS)\medialib_mediactrlcmn.obj &
$(OBJS)\medialib_mediactrl_am.obj &
$(OBJS)\medialib_mediactrl_wmp10.obj &
$(OBJS)\medialib_mediactrl_qt.obj &
$(OBJS)\medialib_activex.obj
$(OBJS)\medialib_mediactrl_qt.obj
HTMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -6180,6 +6180,9 @@ $(OBJS)\monodll_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp
$(OBJS)\monodll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6285,9 +6288,6 @@ $(OBJS)\monodll_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10
$(OBJS)\monodll_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8514,6 +8514,9 @@ $(OBJS)\monolib_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp
$(OBJS)\monolib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8619,9 +8622,6 @@ $(OBJS)\monolib_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10
$(OBJS)\monolib_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -11232,6 +11232,9 @@ $(OBJS)\coredll_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp
$(OBJS)\coredll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -12715,6 +12718,9 @@ $(OBJS)\corelib_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp
$(OBJS)\corelib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -14376,9 +14382,6 @@ $(OBJS)\mediadll_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp1
$(OBJS)\mediadll_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<
$(OBJS)\mediadll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<
$(OBJS)\medialib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
@@ -14394,9 +14397,6 @@ $(OBJS)\medialib_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp1
$(OBJS)\medialib_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
$(OBJS)\medialib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
$(OBJS)\htmldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<

35
build/msw/wx_core.dsp
View File

@@ -747,6 +747,41 @@ SOURCE=..\..\src\msw\ole\access.cpp
!ELSEIF "$(CFG)" == "core - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\ole\activex.cpp
!IF "$(CFG)" == "core - Win32 DLL Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Release"
!ELSEIF "$(CFG)" == "core - Win32 Debug"
!ENDIF
# End Source File

8
build/msw/wx_media.dsp
View File

@@ -258,10 +258,6 @@ SOURCE=..\..\src\common\mediactrlcmn.cpp
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\ole\activex.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\mediactrl_am.cpp
# End Source File
# Begin Source File
@@ -459,10 +455,6 @@ InputPath=..\..\include\wx\msw\setup.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\ole\activex.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "media - Win32 DLL Universal Release"

15
build/msw/wx_vc7_core.vcproj
View File

@@ -922,6 +922,21 @@
Name="Universal Debug|Win32"
ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\ole\activex.cpp">
<FileConfiguration
Name="DLL Universal Release|Win32"
ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Debug|Win32"
ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\app.cpp">
</File>

6
build/msw/wx_vc7_media.vcproj
View File

@@ -574,9 +574,6 @@
<Filter
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
<File
RelativePath="..\..\src\msw\ole\activex.cpp">
</File>
<File
RelativePath="..\..\src\msw\mediactrl_am.cpp">
</File>
@@ -703,9 +700,6 @@
<Filter
Name="MSW Headers"
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">
<File
RelativePath="..\..\include\wx\msw\ole\activex.h">
</File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h">
<FileConfiguration

20
build/msw/wx_vc8_core.vcproj
View File

@@ -1267,6 +1267,26 @@
ExcludedFromBuild="true"
/>
</File>
<File
RelativePath="..\..\src\msw\ole\activex.cpp"
>
<FileConfiguration
Name="DLL Universal Release|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="Universal Release|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="Universal Debug|Win32"
ExcludedFromBuild="true"
/>
</File>
<File
RelativePath="..\..\src\msw\app.cpp"
>

8
build/msw/wx_vc8_media.vcproj
View File

@@ -803,10 +803,6 @@
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
>
<File
RelativePath="..\..\src\msw\ole\activex.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\mediactrl_am.cpp"
>
@@ -969,10 +965,6 @@
Name="MSW Headers"
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}"
>
<File
RelativePath="..\..\include\wx\msw\ole\activex.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h"
>

20
build/msw/wx_vc9_core.vcproj
View File

@@ -1263,6 +1263,26 @@
ExcludedFromBuild="true"
/>
</File>
<File
RelativePath="..\..\src\msw\ole\activex.cpp"
>
<FileConfiguration
Name="DLL Universal Release|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="Universal Release|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="Universal Debug|Win32"
ExcludedFromBuild="true"
/>
</File>
<File
RelativePath="..\..\src\msw\app.cpp"
>

8
build/msw/wx_vc9_media.vcproj
View File

@@ -799,10 +799,6 @@
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
>
<File
RelativePath="..\..\src\msw\ole\activex.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\mediactrl_am.cpp"
>
@@ -965,10 +961,6 @@
Name="MSW Headers"
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}"
>
<File
RelativePath="..\..\include\wx\msw\ole\activex.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h"
>