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

Move src/msw/ole/access.cpp to low-level MSW sources

Browse Source 
This file should be used even in wxUniv builds.

This fixes linking of wxCore when using wxUniv/MSW.
This commit is contained in:
Vadim Zeitlin
2020-02-17 19:46:40 +01:00
parent 80141760e8
commit 89229b7090
7 changed files with 115 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
build/msw/makefile.gcc
View File

@@ -1895,6 +1895,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_notifmsgrt.o \
$(OBJS)\monodll_uuid.o \
$(OBJS)\monodll_evtloop.o \
$(OBJS)\monodll_access.o \
$(OBJS)\monodll_clrpickerg.o \
$(OBJS)\monodll_collpaneg.o \
$(OBJS)\monodll_filepickerg.o \
@@ -1931,7 +1932,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_nativdlg.o \
$(OBJS)\monodll_nativewin.o \
$(OBJS)\monodll_msw_notebook.o \
$(OBJS)\monodll_access.o \
$(OBJS)\monodll_ownerdrw.o \
$(OBJS)\monodll_progdlg.o \
$(OBJS)\monodll_msw_radiobox.o \
@@ -2239,6 +2239,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_notifmsgrt.o \
$(OBJS)\monodll_uuid.o \
$(OBJS)\monodll_evtloop.o \
$(OBJS)\monodll_access.o \
$(OBJS)\monodll_animateg.o \
$(OBJS)\monodll_generic_accel.o \
$(OBJS)\monodll_clrpickerg.o \
@@ -2735,6 +2736,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_notifmsgrt.o \
$(OBJS)\monolib_uuid.o \
$(OBJS)\monolib_evtloop.o \
$(OBJS)\monolib_access.o \
$(OBJS)\monolib_clrpickerg.o \
$(OBJS)\monolib_collpaneg.o \
$(OBJS)\monolib_filepickerg.o \
@@ -2771,7 +2773,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_nativdlg.o \
$(OBJS)\monolib_nativewin.o \
$(OBJS)\monolib_msw_notebook.o \
$(OBJS)\monolib_access.o \
$(OBJS)\monolib_ownerdrw.o \
$(OBJS)\monolib_progdlg.o \
$(OBJS)\monolib_msw_radiobox.o \
@@ -3079,6 +3080,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_notifmsgrt.o \
$(OBJS)\monolib_uuid.o \
$(OBJS)\monolib_evtloop.o \
$(OBJS)\monolib_access.o \
$(OBJS)\monolib_animateg.o \
$(OBJS)\monolib_generic_accel.o \
$(OBJS)\monolib_clrpickerg.o \
@@ -3457,6 +3459,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_notifmsgrt.o \
$(OBJS)\coredll_uuid.o \
$(OBJS)\coredll_evtloop.o \
$(OBJS)\coredll_access.o \
$(OBJS)\coredll_clrpickerg.o \
$(OBJS)\coredll_collpaneg.o \
$(OBJS)\coredll_filepickerg.o \
@@ -3493,7 +3496,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_nativdlg.o \
$(OBJS)\coredll_nativewin.o \
$(OBJS)\coredll_msw_notebook.o \
$(OBJS)\coredll_access.o \
$(OBJS)\coredll_ownerdrw.o \
$(OBJS)\coredll_progdlg.o \
$(OBJS)\coredll_msw_radiobox.o \
@@ -3801,6 +3803,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_notifmsgrt.o \
$(OBJS)\coredll_uuid.o \
$(OBJS)\coredll_evtloop.o \
$(OBJS)\coredll_access.o \
$(OBJS)\coredll_animateg.o \
$(OBJS)\coredll_generic_accel.o \
$(OBJS)\coredll_clrpickerg.o \
@@ -4137,6 +4140,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_notifmsgrt.o \
$(OBJS)\corelib_uuid.o \
$(OBJS)\corelib_evtloop.o \
$(OBJS)\corelib_access.o \
$(OBJS)\corelib_clrpickerg.o \
$(OBJS)\corelib_collpaneg.o \
$(OBJS)\corelib_filepickerg.o \
@@ -4173,7 +4177,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_nativdlg.o \
$(OBJS)\corelib_nativewin.o \
$(OBJS)\corelib_msw_notebook.o \
$(OBJS)\corelib_access.o \
$(OBJS)\corelib_ownerdrw.o \
$(OBJS)\corelib_progdlg.o \
$(OBJS)\corelib_msw_radiobox.o \
@@ -4481,6 +4484,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_notifmsgrt.o \
$(OBJS)\corelib_uuid.o \
$(OBJS)\corelib_evtloop.o \
$(OBJS)\corelib_access.o \
$(OBJS)\corelib_animateg.o \
$(OBJS)\corelib_generic_accel.o \
$(OBJS)\corelib_clrpickerg.o \
@@ -7203,9 +7207,6 @@ $(OBJS)\monodll_nativewin.o: ../../src/msw/nativewin.cpp
$(OBJS)\monodll_msw_notebook.o: ../../src/msw/notebook.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8241,6 +8242,11 @@ $(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9758,9 +9764,6 @@ $(OBJS)\monolib_nativewin.o: ../../src/msw/nativewin.cpp
$(OBJS)\monolib_msw_notebook.o: ../../src/msw/notebook.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10796,6 +10799,11 @@ $(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -12727,9 +12735,6 @@ $(OBJS)\coredll_nativewin.o: ../../src/msw/nativewin.cpp
$(OBJS)\coredll_msw_notebook.o: ../../src/msw/notebook.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13306,6 +13311,11 @@ $(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14460,9 +14470,6 @@ $(OBJS)\corelib_nativewin.o: ../../src/msw/nativewin.cpp
$(OBJS)\corelib_msw_notebook.o: ../../src/msw/notebook.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -15039,6 +15046,11 @@ $(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_access.o: ../../src/msw/ole/access.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<