From 03c1266970002c4dcda7dfa5c6163fbe6b3c32ff Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Sep 2012 00:42:03 +0000 Subject: [PATCH] Link MSW-specific event loop files in wxUniv/MSW. This fixes wxUniv build after the changes of r72008. Closes #14606. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 34 ++++++++++++++++++++++------------ build/bakefiles/files.bkl | 13 +++++++++++++ build/msw/makefile.bcc | 36 ++++++++++++++++++++++++------------ build/msw/makefile.gcc | 36 ++++++++++++++++++++++++------------ build/msw/makefile.vc | 36 ++++++++++++++++++++++++------------ build/msw/makefile.wat | 36 ++++++++++++++++++++++++------------ build/msw/wx_core.dsp | 31 ------------------------------- build/msw/wx_vc7_core.vcproj | 12 ------------ build/msw/wx_vc8_core.vcproj | 16 ---------------- build/msw/wx_vc9_core.vcproj | 16 ---------------- 10 files changed, 131 insertions(+), 135 deletions(-) diff --git a/Makefile.in b/Makefile.in index dab1a63fbe..b0aaf9f4ca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2163,6 +2163,7 @@ COND_PLATFORM_UNIX_1_GTK_PLATFORM_HDR = \ wx/unix/fontutil.h \ wx/unix/utilsx11.h @COND_PLATFORM_UNIX_1@GTK_PLATFORM_HDR = $(COND_PLATFORM_UNIX_1_GTK_PLATFORM_HDR) +@COND_TOOLKIT_MSW@UNIV_PLATFORM_HDR = wx/msw/evtloop.h @COND_PLATFORM_MACOSX_1@ADVANCED_GTK_PLATFORM_HDR = \ @COND_PLATFORM_MACOSX_1@ wx/unix/joystick.h wx/unix/sound.h \ @COND_PLATFORM_MACOSX_1@ wx/unix/taskbarx11.h @@ -3949,6 +3950,7 @@ COND_WXUNIV_1_ADVANCED_HDR = \ @COND_TOOLKIT_X11@MEDIA_PLATFORM_HDR = @COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR) COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS = \ + $(UNIV_PLATFORM_HDR) \ wx/generic/accel.h \ wx/generic/animate.h \ wx/generic/clrpickerg.h \ @@ -4851,6 +4853,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ $(__LOWLEVEL_SRC_OBJECTS_1) \ $(__PLATFORM_SRC_OBJECTS) \ + $(__UNIV_PLATFORM_SRC_OBJECTS) \ monodll_generic_accel.o \ monodll_clrpickerg.o \ monodll_collpaneg.o \ @@ -6308,6 +6311,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_utilsx.o \ monodll_x11_window.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1) +@COND_TOOLKIT_MSW@__UNIV_PLATFORM_SRC_OBJECTS = monodll_msw_evtloop.o COND_WXUNIV_0___ADVANCED_SRC_OBJECTS = \ monodll_animatecmn.o \ monodll_bmpcboxcmn.o \ @@ -7054,6 +7058,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ $(__LOWLEVEL_SRC_OBJECTS_3) \ $(__PLATFORM_SRC_OBJECTS_0) \ + $(__UNIV_PLATFORM_SRC_OBJECTS_1) \ monolib_generic_accel.o \ monolib_clrpickerg.o \ monolib_collpaneg.o \ @@ -8511,6 +8516,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_utilsx.o \ monolib_x11_window.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3) +@COND_TOOLKIT_MSW@__UNIV_PLATFORM_SRC_OBJECTS_1 = monolib_msw_evtloop.o COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 = \ monolib_animatecmn.o \ monolib_bmpcboxcmn.o \ @@ -9433,6 +9439,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_5) \ $(__PLATFORM_SRC_OBJECTS_8) \ + $(__UNIV_PLATFORM_SRC_OBJECTS_2) \ coredll_generic_accel.o \ coredll_clrpickerg.o \ coredll_collpaneg.o \ @@ -10890,6 +10897,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_utilsx.o \ coredll_x11_window.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5) +@COND_TOOLKIT_MSW@__UNIV_PLATFORM_SRC_OBJECTS_2 = coredll_msw_evtloop.o COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__corelib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname) @@ -11076,6 +11084,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ $(__LOWLEVEL_SRC_OBJECTS_7) \ $(__PLATFORM_SRC_OBJECTS_9) \ + $(__UNIV_PLATFORM_SRC_OBJECTS_3) \ corelib_generic_accel.o \ corelib_clrpickerg.o \ corelib_collpaneg.o \ @@ -12533,6 +12542,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_utilsx.o \ corelib_x11_window.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7) +@COND_TOOLKIT_MSW@__UNIV_PLATFORM_SRC_OBJECTS_3 = corelib_msw_evtloop.o @COND_SHARED_1@____wxcore_namedll_DEP = $(__coredll___depname) @COND_SHARED_0@____wxcore_namelib_DEP = $(__corelib___depname) COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \ @@ -20570,12 +20580,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp - @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp @@ -26264,12 +26274,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp - @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp @@ -32126,12 +32136,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp - @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp @@ -36371,12 +36381,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp - @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 8c7ada93a1..bd105da812 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2760,7 +2760,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/univ/themes/win32.cpp + + + src/msw/evtloop.cpp + + + + + wx/msw/evtloop.h + + + + $(UNIV_PLATFORM_SRC) src/generic/accel.cpp src/generic/clrpickerg.cpp src/generic/collpaneg.cpp @@ -2812,6 +2824,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/univ/winuniv.cpp + $(UNIV_PLATFORM_HDR) wx/generic/accel.h wx/generic/animate.h wx/generic/clrpickerg.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index b39db854fd..65c786fcd9 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -2077,6 +2077,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_uuid.obj \ + $(OBJS)\monodll_evtloop.obj \ $(OBJS)\monodll_generic_accel.obj \ $(OBJS)\monodll_clrpickerg.obj \ $(OBJS)\monodll_collpaneg.obj \ @@ -2864,6 +2865,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_uuid.obj \ + $(OBJS)\monolib_evtloop.obj \ $(OBJS)\monolib_generic_accel.obj \ $(OBJS)\monolib_clrpickerg.obj \ $(OBJS)\monolib_collpaneg.obj \ @@ -3533,6 +3535,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_uuid.obj \ + $(OBJS)\coredll_evtloop.obj \ $(OBJS)\coredll_generic_accel.obj \ $(OBJS)\coredll_clrpickerg.obj \ $(OBJS)\coredll_collpaneg.obj \ @@ -4078,6 +4081,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_uuid.obj \ + $(OBJS)\corelib_evtloop.obj \ $(OBJS)\corelib_generic_accel.obj \ $(OBJS)\corelib_clrpickerg.obj \ $(OBJS)\corelib_collpaneg.obj \ @@ -6554,9 +6558,6 @@ $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp -$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp - $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp @@ -7548,6 +7549,11 @@ $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp !endif @@ -8970,9 +8976,6 @@ $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp -$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp - $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp @@ -9964,6 +9967,11 @@ $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp !endif @@ -11797,9 +11805,6 @@ $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp -$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp - $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp @@ -12347,6 +12352,11 @@ $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp !endif @@ -13210,9 +13220,6 @@ $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp -$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp - $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp @@ -13760,6 +13767,11 @@ $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp !endif diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index e7a744f451..ce845a7241 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -2092,6 +2092,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpwin.o \ $(OBJS)\monodll_automtn.o \ $(OBJS)\monodll_uuid.o \ + $(OBJS)\monodll_evtloop.o \ $(OBJS)\monodll_generic_accel.o \ $(OBJS)\monodll_clrpickerg.o \ $(OBJS)\monodll_collpaneg.o \ @@ -2885,6 +2886,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpwin.o \ $(OBJS)\monolib_automtn.o \ $(OBJS)\monolib_uuid.o \ + $(OBJS)\monolib_evtloop.o \ $(OBJS)\monolib_generic_accel.o \ $(OBJS)\monolib_clrpickerg.o \ $(OBJS)\monolib_collpaneg.o \ @@ -3570,6 +3572,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpwin.o \ $(OBJS)\coredll_automtn.o \ $(OBJS)\coredll_uuid.o \ + $(OBJS)\coredll_evtloop.o \ $(OBJS)\coredll_generic_accel.o \ $(OBJS)\coredll_clrpickerg.o \ $(OBJS)\coredll_collpaneg.o \ @@ -4123,6 +4126,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpwin.o \ $(OBJS)\corelib_automtn.o \ $(OBJS)\corelib_uuid.o \ + $(OBJS)\corelib_evtloop.o \ $(OBJS)\corelib_generic_accel.o \ $(OBJS)\corelib_clrpickerg.o \ $(OBJS)\corelib_collpaneg.o \ @@ -6723,9 +6727,6 @@ $(OBJS)\monodll_dirdlg.o: ../../src/msw/dirdlg.cpp $(OBJS)\monodll_dragimag.o: ../../src/msw/dragimag.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_filedlg.o: ../../src/msw/filedlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7717,6 +7718,11 @@ $(OBJS)\monodll_prntdlgg.o: ../../src/generic/prntdlgg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monodll_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -9139,9 +9145,6 @@ $(OBJS)\monolib_dirdlg.o: ../../src/msw/dirdlg.cpp $(OBJS)\monolib_dragimag.o: ../../src/msw/dragimag.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_filedlg.o: ../../src/msw/filedlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10133,6 +10136,11 @@ $(OBJS)\monolib_prntdlgg.o: ../../src/generic/prntdlgg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monolib_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -11966,9 +11974,6 @@ $(OBJS)\coredll_dirdlg.o: ../../src/msw/dirdlg.cpp $(OBJS)\coredll_dragimag.o: ../../src/msw/dragimag.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\coredll_filedlg.o: ../../src/msw/filedlg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12516,6 +12521,11 @@ $(OBJS)\coredll_prntdlgg.o: ../../src/generic/prntdlgg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\coredll_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -13379,9 +13389,6 @@ $(OBJS)\corelib_dirdlg.o: ../../src/msw/dirdlg.cpp $(OBJS)\corelib_dragimag.o: ../../src/msw/dragimag.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\corelib_filedlg.o: ../../src/msw/filedlg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13929,6 +13936,11 @@ $(OBJS)\corelib_prntdlgg.o: ../../src/generic/prntdlgg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\corelib_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 5d516d95ec..881307bdfc 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -2369,6 +2369,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_uuid.obj \ + $(OBJS)\monodll_evtloop.obj \ $(OBJS)\monodll_generic_accel.obj \ $(OBJS)\monodll_clrpickerg.obj \ $(OBJS)\monodll_collpaneg.obj \ @@ -3162,6 +3163,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_uuid.obj \ + $(OBJS)\monolib_evtloop.obj \ $(OBJS)\monolib_generic_accel.obj \ $(OBJS)\monolib_clrpickerg.obj \ $(OBJS)\monolib_collpaneg.obj \ @@ -3897,6 +3899,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_uuid.obj \ + $(OBJS)\coredll_evtloop.obj \ $(OBJS)\coredll_generic_accel.obj \ $(OBJS)\coredll_clrpickerg.obj \ $(OBJS)\coredll_collpaneg.obj \ @@ -4448,6 +4451,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_uuid.obj \ + $(OBJS)\corelib_evtloop.obj \ $(OBJS)\corelib_generic_accel.obj \ $(OBJS)\corelib_clrpickerg.obj \ $(OBJS)\corelib_collpaneg.obj \ @@ -7238,9 +7242,6 @@ $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp -$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp - $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp @@ -8232,6 +8233,11 @@ $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp !endif @@ -9654,9 +9660,6 @@ $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp -$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp - $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp @@ -10648,6 +10651,11 @@ $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp !endif @@ -12481,9 +12489,6 @@ $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp -$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp - $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp @@ -13031,6 +13036,11 @@ $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp !endif @@ -13894,9 +13904,6 @@ $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp -$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp - $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp @@ -14444,6 +14451,11 @@ $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp !endif diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 152d8b4dd0..b1db5320a3 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -587,6 +587,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_helpwin.obj & $(OBJS)\monodll_automtn.obj & $(OBJS)\monodll_uuid.obj & + $(OBJS)\monodll_evtloop.obj & $(OBJS)\monodll_generic_accel.obj & $(OBJS)\monodll_clrpickerg.obj & $(OBJS)\monodll_collpaneg.obj & @@ -1385,6 +1386,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_helpwin.obj & $(OBJS)\monolib_automtn.obj & $(OBJS)\monolib_uuid.obj & + $(OBJS)\monolib_evtloop.obj & $(OBJS)\monolib_generic_accel.obj & $(OBJS)\monolib_clrpickerg.obj & $(OBJS)\monolib_collpaneg.obj & @@ -2081,6 +2083,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_helpwin.obj & $(OBJS)\coredll_automtn.obj & $(OBJS)\coredll_uuid.obj & + $(OBJS)\coredll_evtloop.obj & $(OBJS)\coredll_generic_accel.obj & $(OBJS)\coredll_clrpickerg.obj & $(OBJS)\coredll_collpaneg.obj & @@ -2636,6 +2639,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_helpwin.obj & $(OBJS)\corelib_automtn.obj & $(OBJS)\corelib_uuid.obj & + $(OBJS)\corelib_evtloop.obj & $(OBJS)\corelib_generic_accel.obj & $(OBJS)\corelib_clrpickerg.obj & $(OBJS)\corelib_collpaneg.obj & @@ -6996,9 +7000,6 @@ $(OBJS)\monodll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp $(OBJS)\monodll_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7990,6 +7991,11 @@ $(OBJS)\monodll_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\monodll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monodll_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -9412,9 +9418,6 @@ $(OBJS)\monolib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp $(OBJS)\monolib_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10406,6 +10409,11 @@ $(OBJS)\monolib_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\monolib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monolib_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -12239,9 +12247,6 @@ $(OBJS)\coredll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp $(OBJS)\coredll_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12789,6 +12794,11 @@ $(OBJS)\coredll_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\coredll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\coredll_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -13652,9 +13662,6 @@ $(OBJS)\corelib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp $(OBJS)\corelib_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -14202,6 +14209,11 @@ $(OBJS)\corelib_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\corelib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\corelib_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 0081ea8084..3be7eb9f59 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -1415,37 +1415,6 @@ SOURCE=..\..\src\msw\enhmeta.cpp # Begin Source File SOURCE=..\..\src\msw\evtloop.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 # Begin Source File diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 3830b5e547..206121a726 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -1491,18 +1491,6 @@ - - - - diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 065ed13c3e..86004c8994 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -2022,22 +2022,6 @@ - - - - - - - -