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

wxActiveX files are low level as there is no wxUniv equivalent for this functionality (closes #10786 as this resulted in link errors when building wxMedia/Univ before)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-05-12 08:59:57 +00:00
parent aced1133b1
commit fa245b25f2
10 changed files with 170 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
build/msw/makefile.gcc
View File

@@ -1551,6 +1551,7 @@ endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_activex.o \
$(OBJS)\monodll_app.o \
$(OBJS)\monodll_bitmap.o \
$(OBJS)\monodll_brush.o \
@@ -1634,7 +1635,6 @@ ____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 \
@@ -1795,6 +1795,7 @@ endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),1)
____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_activex.o \
$(OBJS)\monodll_app.o \
$(OBJS)\monodll_bitmap.o \
$(OBJS)\monodll_brush.o \
@@ -2240,6 +2241,7 @@ endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_activex.o \
$(OBJS)\monolib_app.o \
$(OBJS)\monolib_bitmap.o \
$(OBJS)\monolib_brush.o \
@@ -2323,7 +2325,6 @@ ____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 \
@@ -2484,6 +2485,7 @@ endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),1)
____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_activex.o \
$(OBJS)\monolib_app.o \
$(OBJS)\monolib_bitmap.o \
$(OBJS)\monolib_brush.o \
@@ -2844,6 +2846,7 @@ endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_activex.o \
$(OBJS)\coredll_app.o \
$(OBJS)\coredll_bitmap.o \
$(OBJS)\coredll_brush.o \
@@ -2927,7 +2930,6 @@ ____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 \
@@ -3088,6 +3090,7 @@ endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),1)
____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_activex.o \
$(OBJS)\coredll_app.o \
$(OBJS)\coredll_bitmap.o \
$(OBJS)\coredll_brush.o \
@@ -3338,6 +3341,7 @@ endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_activex.o \
$(OBJS)\corelib_app.o \
$(OBJS)\corelib_bitmap.o \
$(OBJS)\corelib_brush.o \
@@ -3421,7 +3425,6 @@ ____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 \
@@ -3582,6 +3585,7 @@ endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),1)
____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_activex.o \
$(OBJS)\corelib_app.o \
$(OBJS)\corelib_bitmap.o \
$(OBJS)\corelib_brush.o \
@@ -5957,9 +5961,6 @@ $(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) $<
@@ -6404,6 +6405,11 @@ $(OBJS)\monodll_xml.o: ../../src/xml/xml.cpp
$(OBJS)\monodll_xtixml.o: ../../src/common/xtixml.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_app.o: ../../src/msw/app.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8298,9 +8304,6 @@ $(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) $<
@@ -8745,6 +8748,11 @@ $(OBJS)\monolib_xml.o: ../../src/xml/xml.cpp
$(OBJS)\monolib_xtixml.o: ../../src/common/xtixml.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_app.o: ../../src/msw/app.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11029,9 +11037,6 @@ $(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) $<
@@ -11113,6 +11118,11 @@ $(OBJS)\coredll_mono.o: ../../src/univ/themes/mono.cpp
$(OBJS)\coredll_win32.o: ../../src/univ/themes/win32.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_app.o: ../../src/msw/app.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -12520,9 +12530,6 @@ $(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) $<
@@ -12604,6 +12611,11 @@ $(OBJS)\corelib_mono.o: ../../src/univ/themes/mono.cpp
$(OBJS)\corelib_win32.o: ../../src/univ/themes/win32.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_app.o: ../../src/msw/app.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<