From 99d082cae79ef4561f910b13ab6aedfdec0208fe Mon Sep 17 00:00:00 2001 From: Tim S Date: Sun, 14 Oct 2018 21:56:36 -0400 Subject: [PATCH 1/6] Add WXUNIVERSAL guard for wxMSW/Univ --- src/aui/tabartmsw.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aui/tabartmsw.cpp b/src/aui/tabartmsw.cpp index 2ba5961a63..5768ba34e1 100644 --- a/src/aui/tabartmsw.cpp +++ b/src/aui/tabartmsw.cpp @@ -23,7 +23,7 @@ #include "wx/msw/private.h" #include "wx/renderer.h" -#if wxUSE_AUI +#if wxUSE_AUI && !defined(__WXUNIVERSAL__) wxAuiMSWTabArt::wxAuiMSWTabArt() { From 09aa8c741e9412cec46b031a69a6e0e0560215e1 Mon Sep 17 00:00:00 2001 From: Tim S Date: Sat, 13 Oct 2018 22:26:03 -0400 Subject: [PATCH 2/6] Move msw/evtloop.{h,cpp} from MSW_{HDR,SRC} to under MSW_LOWLEVEL_{HDR,SRC} --- build/files | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/files b/build/files index 03bf2cbcea..7197738944 100644 --- a/build/files +++ b/build/files @@ -1903,6 +1903,7 @@ MSW_LOWLEVEL_SRC = src/msw/dib.cpp src/msw/display.cpp src/msw/enhmeta.cpp + src/msw/evtloop.cpp src/msw/font.cpp src/msw/fontenum.cpp src/msw/fontutil.cpp @@ -1952,6 +1953,7 @@ MSW_LOWLEVEL_SRC = MSW_LOWLEVEL_HDR = wx/generic/activityindicator.h + wx/msw/evtloop.h wx/msw/helpchm.h wx/msw/helpwin.h wx/msw/htmlhelp.h @@ -1993,7 +1995,6 @@ MSW_SRC = src/msw/dialog.cpp src/msw/dirdlg.cpp src/msw/dragimag.cpp - src/msw/evtloop.cpp src/msw/filedlg.cpp src/msw/frame.cpp src/msw/gauge.cpp @@ -2075,7 +2076,6 @@ MSW_HDR = wx/msw/dirdlg.h wx/msw/dragimag.h wx/msw/enhmeta.h - wx/msw/evtloop.h wx/msw/filedlg.h wx/msw/font.h wx/msw/frame.h From d9891c4aa16a2a6070434e9462040840ac2611d2 Mon Sep 17 00:00:00 2001 From: Tim S Date: Sun, 14 Oct 2018 14:58:54 -0400 Subject: [PATCH 3/6] Remove msw/evtloop.{h,cpp} from UNIV_PLATFORM_{HDR,SRC} --- build/bakefiles/files.bkl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 328e0c3b68..6482166980 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2730,9 +2730,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - - src/msw/evtloop.cpp - diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index f8c6c12d39..999faa219e 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -1947,8 +1947,8 @@ set(MSW_LOWLEVEL_SRC src/msw/notifmsg.cpp src/msw/ole/automtn.cpp src/msw/taskbar.cpp - src/generic/activityindicator.cpp src/msw/richtooltip.cpp + src/msw/evtloop.cpp ) set(MSW_LOWLEVEL_HDR @@ -1959,10 +1959,10 @@ set(MSW_LOWLEVEL_HDR wx/msw/htmlhelp.h wx/msw/helpchm.h wx/msw/sound.h - wx/generic/activityindicator.h wx/msw/joystick.h wx/msw/helpwin.h wx/msw/taskbar.h + wx/msw/evtloop.h ) set(MSW_DESKTOP_LOWLEVEL_SRC @@ -2000,7 +2000,6 @@ set(MSW_SRC src/msw/dialog.cpp src/msw/dirdlg.cpp src/msw/dragimag.cpp - src/msw/evtloop.cpp src/msw/filedlg.cpp src/msw/frame.cpp src/msw/gauge.cpp @@ -2047,6 +2046,7 @@ set(MSW_SRC src/msw/commandlinkbutton.cpp src/msw/datetimectrl.cpp src/msw/hyperlink.cpp + src/generic/activityindicator.cpp ) set(MSW_HDR @@ -2084,7 +2084,6 @@ set(MSW_HDR wx/msw/dirdlg.h wx/msw/dragimag.h wx/msw/enhmeta.h - wx/msw/evtloop.h wx/msw/filedlg.h wx/msw/font.h wx/msw/frame.h @@ -2155,6 +2154,7 @@ set(MSW_HDR wx/msw/datetimectrl.h wx/msw/timectrl.h wx/generic/animate.h + wx/generic/activityindicator.h ) set(MSW_RSC @@ -2596,7 +2596,6 @@ set(UNIV_THEMES_SRC set(UNIV_SRC ${UNIV_PLATFORM_SRC} src/generic/accel.cpp - src/generic/activityindicator.cpp src/generic/clrpickerg.cpp src/generic/collpaneg.cpp src/generic/colrdlgg.cpp @@ -2646,12 +2645,12 @@ set(UNIV_SRC src/univ/toolbar.cpp src/univ/topluniv.cpp src/univ/winuniv.cpp + src/generic/activityindicator.cpp ) set(UNIV_HDR ${UNIV_PLATFORM_HDR} wx/generic/accel.h - wx/generic/activityindicator.h wx/generic/animate.h wx/generic/clrpickerg.h wx/generic/collpaneg.h @@ -2708,6 +2707,7 @@ set(UNIV_HDR wx/univ/toolbar.h wx/univ/toplevel.h wx/univ/window.h + wx/generic/activityindicator.h ) set(MEDIA_CMN_SRC diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 36967bced7..24a3687ebe 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1851,8 +1851,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_notifmsgrt.obj \ - $(OBJS)\monodll_activityindicator.obj \ $(OBJS)\monodll_uuid.obj \ + $(OBJS)\monodll_evtloop.obj \ $(OBJS)\monodll_clrpickerg.obj \ $(OBJS)\monodll_collpaneg.obj \ $(OBJS)\monodll_filepickerg.obj \ @@ -1874,7 +1874,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msw_dialog.obj \ $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_dragimag.obj \ - $(OBJS)\monodll_evtloop.obj \ $(OBJS)\monodll_filedlg.obj \ $(OBJS)\monodll_frame.obj \ $(OBJS)\monodll_msw_gauge.obj \ @@ -1922,6 +1921,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_datetimectrl.obj \ $(OBJS)\monodll_timectrl.obj \ $(OBJS)\monodll_datecontrols.obj \ + $(OBJS)\monodll_activityindicator.obj \ $(OBJS)\monodll_msw_checklst.obj \ $(OBJS)\monodll_msw_fdrepdlg.obj \ $(OBJS)\monodll_fontdlg.obj \ @@ -2192,9 +2192,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_notifmsgrt.obj \ - $(OBJS)\monodll_activityindicator.obj \ $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_evtloop.obj \ + $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_generic_accel.obj \ $(OBJS)\monodll_clrpickerg.obj \ $(OBJS)\monodll_collpaneg.obj \ @@ -2680,8 +2680,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_notifmsgrt.obj \ - $(OBJS)\monolib_activityindicator.obj \ $(OBJS)\monolib_uuid.obj \ + $(OBJS)\monolib_evtloop.obj \ $(OBJS)\monolib_clrpickerg.obj \ $(OBJS)\monolib_collpaneg.obj \ $(OBJS)\monolib_filepickerg.obj \ @@ -2703,7 +2703,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msw_dialog.obj \ $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_dragimag.obj \ - $(OBJS)\monolib_evtloop.obj \ $(OBJS)\monolib_filedlg.obj \ $(OBJS)\monolib_frame.obj \ $(OBJS)\monolib_msw_gauge.obj \ @@ -2751,6 +2750,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_datetimectrl.obj \ $(OBJS)\monolib_timectrl.obj \ $(OBJS)\monolib_datecontrols.obj \ + $(OBJS)\monolib_activityindicator.obj \ $(OBJS)\monolib_msw_checklst.obj \ $(OBJS)\monolib_msw_fdrepdlg.obj \ $(OBJS)\monolib_fontdlg.obj \ @@ -3021,9 +3021,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_notifmsgrt.obj \ - $(OBJS)\monolib_activityindicator.obj \ $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_evtloop.obj \ + $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_generic_accel.obj \ $(OBJS)\monolib_clrpickerg.obj \ $(OBJS)\monolib_collpaneg.obj \ @@ -3384,8 +3384,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_sound.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_notifmsgrt.obj \ - $(OBJS)\coredll_activityindicator.obj \ $(OBJS)\coredll_uuid.obj \ + $(OBJS)\coredll_evtloop.obj \ $(OBJS)\coredll_clrpickerg.obj \ $(OBJS)\coredll_collpaneg.obj \ $(OBJS)\coredll_filepickerg.obj \ @@ -3407,7 +3407,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msw_dialog.obj \ $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_dragimag.obj \ - $(OBJS)\coredll_evtloop.obj \ $(OBJS)\coredll_filedlg.obj \ $(OBJS)\coredll_frame.obj \ $(OBJS)\coredll_msw_gauge.obj \ @@ -3455,6 +3454,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_datetimectrl.obj \ $(OBJS)\coredll_timectrl.obj \ $(OBJS)\coredll_datecontrols.obj \ + $(OBJS)\coredll_activityindicator.obj \ $(OBJS)\coredll_msw_checklst.obj \ $(OBJS)\coredll_msw_fdrepdlg.obj \ $(OBJS)\coredll_fontdlg.obj \ @@ -3725,9 +3725,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_sound.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_notifmsgrt.obj \ - $(OBJS)\coredll_activityindicator.obj \ $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_evtloop.obj \ + $(OBJS)\coredll_animateg.obj \ $(OBJS)\coredll_generic_accel.obj \ $(OBJS)\coredll_clrpickerg.obj \ $(OBJS)\coredll_collpaneg.obj \ @@ -4054,8 +4054,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_sound.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_notifmsgrt.obj \ - $(OBJS)\corelib_activityindicator.obj \ $(OBJS)\corelib_uuid.obj \ + $(OBJS)\corelib_evtloop.obj \ $(OBJS)\corelib_clrpickerg.obj \ $(OBJS)\corelib_collpaneg.obj \ $(OBJS)\corelib_filepickerg.obj \ @@ -4077,7 +4077,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msw_dialog.obj \ $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_dragimag.obj \ - $(OBJS)\corelib_evtloop.obj \ $(OBJS)\corelib_filedlg.obj \ $(OBJS)\corelib_frame.obj \ $(OBJS)\corelib_msw_gauge.obj \ @@ -4125,6 +4124,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_datetimectrl.obj \ $(OBJS)\corelib_timectrl.obj \ $(OBJS)\corelib_datecontrols.obj \ + $(OBJS)\corelib_activityindicator.obj \ $(OBJS)\corelib_msw_checklst.obj \ $(OBJS)\corelib_msw_fdrepdlg.obj \ $(OBJS)\corelib_fontdlg.obj \ @@ -4395,9 +4395,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_sound.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_notifmsgrt.obj \ - $(OBJS)\corelib_activityindicator.obj \ $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_evtloop.obj \ + $(OBJS)\corelib_animateg.obj \ $(OBJS)\corelib_generic_accel.obj \ $(OBJS)\corelib_clrpickerg.obj \ $(OBJS)\corelib_collpaneg.obj \ @@ -6934,9 +6934,6 @@ $(OBJS)\monodll_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp $(OBJS)\monodll_customdraw.obj: ..\..\src\msw\customdraw.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\customdraw.cpp -$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp - $(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp @@ -7888,18 +7885,13 @@ $(OBJS)\monodll_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp +$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp +$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif !if "$(USE_GUI)" == "1" @@ -7928,8 +7920,13 @@ $(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 +$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp !endif !if "$(USE_GUI)" == "1" @@ -9478,9 +9475,6 @@ $(OBJS)\monolib_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp $(OBJS)\monolib_customdraw.obj: ..\..\src\msw\customdraw.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\customdraw.cpp -$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp - $(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp @@ -10432,18 +10426,13 @@ $(OBJS)\monolib_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp +$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp +$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif !if "$(USE_GUI)" == "1" @@ -10472,8 +10461,13 @@ $(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 +$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp !endif !if "$(USE_GUI)" == "1" @@ -12436,9 +12430,6 @@ $(OBJS)\coredll_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp $(OBJS)\coredll_customdraw.obj: ..\..\src\msw\customdraw.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\customdraw.cpp -$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp - $(OBJS)\coredll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp @@ -12940,18 +12931,13 @@ $(OBJS)\coredll_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp +$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp +$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif !if "$(USE_GUI)" == "1" @@ -12980,8 +12966,13 @@ $(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 +$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp !endif !if "$(USE_GUI)" == "1" @@ -14167,9 +14158,6 @@ $(OBJS)\corelib_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp $(OBJS)\corelib_customdraw.obj: ..\..\src\msw\customdraw.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\customdraw.cpp -$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp - $(OBJS)\corelib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp @@ -14671,18 +14659,13 @@ $(OBJS)\corelib_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp +$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp +$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif !if "$(USE_GUI)" == "1" @@ -14711,8 +14694,13 @@ $(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 +$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp !endif !if "$(USE_GUI)" == "1" diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 65681bb814..18792ec66d 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1877,8 +1877,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sound.o \ $(OBJS)\monodll_automtn.o \ $(OBJS)\monodll_notifmsgrt.o \ - $(OBJS)\monodll_activityindicator.o \ $(OBJS)\monodll_uuid.o \ + $(OBJS)\monodll_evtloop.o \ $(OBJS)\monodll_clrpickerg.o \ $(OBJS)\monodll_collpaneg.o \ $(OBJS)\monodll_filepickerg.o \ @@ -1900,7 +1900,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msw_dialog.o \ $(OBJS)\monodll_dirdlg.o \ $(OBJS)\monodll_dragimag.o \ - $(OBJS)\monodll_evtloop.o \ $(OBJS)\monodll_filedlg.o \ $(OBJS)\monodll_frame.o \ $(OBJS)\monodll_msw_gauge.o \ @@ -1948,6 +1947,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_datetimectrl.o \ $(OBJS)\monodll_timectrl.o \ $(OBJS)\monodll_datecontrols.o \ + $(OBJS)\monodll_activityindicator.o \ $(OBJS)\monodll_msw_checklst.o \ $(OBJS)\monodll_msw_fdrepdlg.o \ $(OBJS)\monodll_fontdlg.o \ @@ -2220,9 +2220,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sound.o \ $(OBJS)\monodll_automtn.o \ $(OBJS)\monodll_notifmsgrt.o \ - $(OBJS)\monodll_activityindicator.o \ $(OBJS)\monodll_uuid.o \ $(OBJS)\monodll_evtloop.o \ + $(OBJS)\monodll_animateg.o \ $(OBJS)\monodll_generic_accel.o \ $(OBJS)\monodll_clrpickerg.o \ $(OBJS)\monodll_collpaneg.o \ @@ -2712,8 +2712,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sound.o \ $(OBJS)\monolib_automtn.o \ $(OBJS)\monolib_notifmsgrt.o \ - $(OBJS)\monolib_activityindicator.o \ $(OBJS)\monolib_uuid.o \ + $(OBJS)\monolib_evtloop.o \ $(OBJS)\monolib_clrpickerg.o \ $(OBJS)\monolib_collpaneg.o \ $(OBJS)\monolib_filepickerg.o \ @@ -2735,7 +2735,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msw_dialog.o \ $(OBJS)\monolib_dirdlg.o \ $(OBJS)\monolib_dragimag.o \ - $(OBJS)\monolib_evtloop.o \ $(OBJS)\monolib_filedlg.o \ $(OBJS)\monolib_frame.o \ $(OBJS)\monolib_msw_gauge.o \ @@ -2783,6 +2782,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_datetimectrl.o \ $(OBJS)\monolib_timectrl.o \ $(OBJS)\monolib_datecontrols.o \ + $(OBJS)\monolib_activityindicator.o \ $(OBJS)\monolib_msw_checklst.o \ $(OBJS)\monolib_msw_fdrepdlg.o \ $(OBJS)\monolib_fontdlg.o \ @@ -3055,9 +3055,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sound.o \ $(OBJS)\monolib_automtn.o \ $(OBJS)\monolib_notifmsgrt.o \ - $(OBJS)\monolib_activityindicator.o \ $(OBJS)\monolib_uuid.o \ $(OBJS)\monolib_evtloop.o \ + $(OBJS)\monolib_animateg.o \ $(OBJS)\monolib_generic_accel.o \ $(OBJS)\monolib_clrpickerg.o \ $(OBJS)\monolib_collpaneg.o \ @@ -3432,8 +3432,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_sound.o \ $(OBJS)\coredll_automtn.o \ $(OBJS)\coredll_notifmsgrt.o \ - $(OBJS)\coredll_activityindicator.o \ $(OBJS)\coredll_uuid.o \ + $(OBJS)\coredll_evtloop.o \ $(OBJS)\coredll_clrpickerg.o \ $(OBJS)\coredll_collpaneg.o \ $(OBJS)\coredll_filepickerg.o \ @@ -3455,7 +3455,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msw_dialog.o \ $(OBJS)\coredll_dirdlg.o \ $(OBJS)\coredll_dragimag.o \ - $(OBJS)\coredll_evtloop.o \ $(OBJS)\coredll_filedlg.o \ $(OBJS)\coredll_frame.o \ $(OBJS)\coredll_msw_gauge.o \ @@ -3503,6 +3502,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_datetimectrl.o \ $(OBJS)\coredll_timectrl.o \ $(OBJS)\coredll_datecontrols.o \ + $(OBJS)\coredll_activityindicator.o \ $(OBJS)\coredll_msw_checklst.o \ $(OBJS)\coredll_msw_fdrepdlg.o \ $(OBJS)\coredll_fontdlg.o \ @@ -3775,9 +3775,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_sound.o \ $(OBJS)\coredll_automtn.o \ $(OBJS)\coredll_notifmsgrt.o \ - $(OBJS)\coredll_activityindicator.o \ $(OBJS)\coredll_uuid.o \ $(OBJS)\coredll_evtloop.o \ + $(OBJS)\coredll_animateg.o \ $(OBJS)\coredll_generic_accel.o \ $(OBJS)\coredll_clrpickerg.o \ $(OBJS)\coredll_collpaneg.o \ @@ -4110,8 +4110,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_sound.o \ $(OBJS)\corelib_automtn.o \ $(OBJS)\corelib_notifmsgrt.o \ - $(OBJS)\corelib_activityindicator.o \ $(OBJS)\corelib_uuid.o \ + $(OBJS)\corelib_evtloop.o \ $(OBJS)\corelib_clrpickerg.o \ $(OBJS)\corelib_collpaneg.o \ $(OBJS)\corelib_filepickerg.o \ @@ -4133,7 +4133,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msw_dialog.o \ $(OBJS)\corelib_dirdlg.o \ $(OBJS)\corelib_dragimag.o \ - $(OBJS)\corelib_evtloop.o \ $(OBJS)\corelib_filedlg.o \ $(OBJS)\corelib_frame.o \ $(OBJS)\corelib_msw_gauge.o \ @@ -4181,6 +4180,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_datetimectrl.o \ $(OBJS)\corelib_timectrl.o \ $(OBJS)\corelib_datecontrols.o \ + $(OBJS)\corelib_activityindicator.o \ $(OBJS)\corelib_msw_checklst.o \ $(OBJS)\corelib_msw_fdrepdlg.o \ $(OBJS)\corelib_fontdlg.o \ @@ -4453,9 +4453,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_sound.o \ $(OBJS)\corelib_automtn.o \ $(OBJS)\corelib_notifmsgrt.o \ - $(OBJS)\corelib_activityindicator.o \ $(OBJS)\corelib_uuid.o \ $(OBJS)\corelib_evtloop.o \ + $(OBJS)\corelib_animateg.o \ $(OBJS)\corelib_generic_accel.o \ $(OBJS)\corelib_clrpickerg.o \ $(OBJS)\corelib_collpaneg.o \ @@ -7116,9 +7116,6 @@ $(OBJS)\monodll_systhemectrl.o: ../../src/msw/systhemectrl.cpp $(OBJS)\monodll_customdraw.o: ../../src/msw/customdraw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8069,23 +8066,16 @@ $(OBJS)\monodll_notifmsgrt.o: ../../src/msw/rt/notifmsgrt.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_activityindicator.o: ../../src/generic/activityindicator.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\monodll_activityindicator.o: ../../src/generic/activityindicator.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_uuid.o: ../../src/msw/ole/uuid.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< 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_clrpickerg.o: ../../src/generic/clrpickerg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8112,7 +8102,12 @@ $(OBJS)\monodll_prntdlgg.o: ../../src/generic/prntdlgg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp +$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_activityindicator.o: ../../src/generic/activityindicator.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -9662,9 +9657,6 @@ $(OBJS)\monolib_systhemectrl.o: ../../src/msw/systhemectrl.cpp $(OBJS)\monolib_customdraw.o: ../../src/msw/customdraw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10615,23 +10607,16 @@ $(OBJS)\monolib_notifmsgrt.o: ../../src/msw/rt/notifmsgrt.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_activityindicator.o: ../../src/generic/activityindicator.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\monolib_activityindicator.o: ../../src/generic/activityindicator.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_uuid.o: ../../src/msw/ole/uuid.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< 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_clrpickerg.o: ../../src/generic/clrpickerg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10658,7 +10643,12 @@ $(OBJS)\monolib_prntdlgg.o: ../../src/generic/prntdlgg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp +$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_activityindicator.o: ../../src/generic/activityindicator.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -12622,9 +12612,6 @@ $(OBJS)\coredll_systhemectrl.o: ../../src/msw/systhemectrl.cpp $(OBJS)\coredll_customdraw.o: ../../src/msw/customdraw.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\coredll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13125,23 +13112,16 @@ $(OBJS)\coredll_notifmsgrt.o: ../../src/msw/rt/notifmsgrt.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_activityindicator.o: ../../src/generic/activityindicator.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\coredll_activityindicator.o: ../../src/generic/activityindicator.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_uuid.o: ../../src/msw/ole/uuid.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< 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_clrpickerg.o: ../../src/generic/clrpickerg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13168,7 +13148,12 @@ $(OBJS)\coredll_prntdlgg.o: ../../src/generic/prntdlgg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp +$(OBJS)\coredll_animateg.o: ../../src/generic/animateg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_activityindicator.o: ../../src/generic/activityindicator.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -14355,9 +14340,6 @@ $(OBJS)\corelib_systhemectrl.o: ../../src/msw/systhemectrl.cpp $(OBJS)\corelib_customdraw.o: ../../src/msw/customdraw.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\corelib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -14858,23 +14840,16 @@ $(OBJS)\corelib_notifmsgrt.o: ../../src/msw/rt/notifmsgrt.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_activityindicator.o: ../../src/generic/activityindicator.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\corelib_activityindicator.o: ../../src/generic/activityindicator.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_uuid.o: ../../src/msw/ole/uuid.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< 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_clrpickerg.o: ../../src/generic/clrpickerg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -14901,7 +14876,12 @@ $(OBJS)\corelib_prntdlgg.o: ../../src/generic/prntdlgg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp +$(OBJS)\corelib_animateg.o: ../../src/generic/animateg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_activityindicator.o: ../../src/generic/activityindicator.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 63065472da..60db1ec578 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -2168,8 +2168,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_notifmsgrt.obj \ - $(OBJS)\monodll_activityindicator.obj \ $(OBJS)\monodll_uuid.obj \ + $(OBJS)\monodll_evtloop.obj \ $(OBJS)\monodll_clrpickerg.obj \ $(OBJS)\monodll_collpaneg.obj \ $(OBJS)\monodll_filepickerg.obj \ @@ -2191,7 +2191,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msw_dialog.obj \ $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_dragimag.obj \ - $(OBJS)\monodll_evtloop.obj \ $(OBJS)\monodll_filedlg.obj \ $(OBJS)\monodll_frame.obj \ $(OBJS)\monodll_msw_gauge.obj \ @@ -2239,6 +2238,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_datetimectrl.obj \ $(OBJS)\monodll_timectrl.obj \ $(OBJS)\monodll_datecontrols.obj \ + $(OBJS)\monodll_activityindicator.obj \ $(OBJS)\monodll_msw_checklst.obj \ $(OBJS)\monodll_msw_fdrepdlg.obj \ $(OBJS)\monodll_fontdlg.obj \ @@ -2509,9 +2509,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_notifmsgrt.obj \ - $(OBJS)\monodll_activityindicator.obj \ $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_evtloop.obj \ + $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_generic_accel.obj \ $(OBJS)\monodll_clrpickerg.obj \ $(OBJS)\monodll_collpaneg.obj \ @@ -3003,8 +3003,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_notifmsgrt.obj \ - $(OBJS)\monolib_activityindicator.obj \ $(OBJS)\monolib_uuid.obj \ + $(OBJS)\monolib_evtloop.obj \ $(OBJS)\monolib_clrpickerg.obj \ $(OBJS)\monolib_collpaneg.obj \ $(OBJS)\monolib_filepickerg.obj \ @@ -3026,7 +3026,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msw_dialog.obj \ $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_dragimag.obj \ - $(OBJS)\monolib_evtloop.obj \ $(OBJS)\monolib_filedlg.obj \ $(OBJS)\monolib_frame.obj \ $(OBJS)\monolib_msw_gauge.obj \ @@ -3074,6 +3073,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_datetimectrl.obj \ $(OBJS)\monolib_timectrl.obj \ $(OBJS)\monolib_datecontrols.obj \ + $(OBJS)\monolib_activityindicator.obj \ $(OBJS)\monolib_msw_checklst.obj \ $(OBJS)\monolib_msw_fdrepdlg.obj \ $(OBJS)\monolib_fontdlg.obj \ @@ -3344,9 +3344,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_notifmsgrt.obj \ - $(OBJS)\monolib_activityindicator.obj \ $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_evtloop.obj \ + $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_generic_accel.obj \ $(OBJS)\monolib_clrpickerg.obj \ $(OBJS)\monolib_collpaneg.obj \ @@ -3773,8 +3773,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_sound.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_notifmsgrt.obj \ - $(OBJS)\coredll_activityindicator.obj \ $(OBJS)\coredll_uuid.obj \ + $(OBJS)\coredll_evtloop.obj \ $(OBJS)\coredll_clrpickerg.obj \ $(OBJS)\coredll_collpaneg.obj \ $(OBJS)\coredll_filepickerg.obj \ @@ -3796,7 +3796,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msw_dialog.obj \ $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_dragimag.obj \ - $(OBJS)\coredll_evtloop.obj \ $(OBJS)\coredll_filedlg.obj \ $(OBJS)\coredll_frame.obj \ $(OBJS)\coredll_msw_gauge.obj \ @@ -3844,6 +3843,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_datetimectrl.obj \ $(OBJS)\coredll_timectrl.obj \ $(OBJS)\coredll_datecontrols.obj \ + $(OBJS)\coredll_activityindicator.obj \ $(OBJS)\coredll_msw_checklst.obj \ $(OBJS)\coredll_msw_fdrepdlg.obj \ $(OBJS)\coredll_fontdlg.obj \ @@ -4114,9 +4114,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_sound.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_notifmsgrt.obj \ - $(OBJS)\coredll_activityindicator.obj \ $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_evtloop.obj \ + $(OBJS)\coredll_animateg.obj \ $(OBJS)\coredll_generic_accel.obj \ $(OBJS)\coredll_clrpickerg.obj \ $(OBJS)\coredll_collpaneg.obj \ @@ -4449,8 +4449,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_sound.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_notifmsgrt.obj \ - $(OBJS)\corelib_activityindicator.obj \ $(OBJS)\corelib_uuid.obj \ + $(OBJS)\corelib_evtloop.obj \ $(OBJS)\corelib_clrpickerg.obj \ $(OBJS)\corelib_collpaneg.obj \ $(OBJS)\corelib_filepickerg.obj \ @@ -4472,7 +4472,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msw_dialog.obj \ $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_dragimag.obj \ - $(OBJS)\corelib_evtloop.obj \ $(OBJS)\corelib_filedlg.obj \ $(OBJS)\corelib_frame.obj \ $(OBJS)\corelib_msw_gauge.obj \ @@ -4520,6 +4519,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_datetimectrl.obj \ $(OBJS)\corelib_timectrl.obj \ $(OBJS)\corelib_datecontrols.obj \ + $(OBJS)\corelib_activityindicator.obj \ $(OBJS)\corelib_msw_checklst.obj \ $(OBJS)\corelib_msw_fdrepdlg.obj \ $(OBJS)\corelib_fontdlg.obj \ @@ -4790,9 +4790,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_sound.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_notifmsgrt.obj \ - $(OBJS)\corelib_activityindicator.obj \ $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_evtloop.obj \ + $(OBJS)\corelib_animateg.obj \ $(OBJS)\corelib_generic_accel.obj \ $(OBJS)\corelib_clrpickerg.obj \ $(OBJS)\corelib_collpaneg.obj \ @@ -7643,9 +7643,6 @@ $(OBJS)\monodll_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp $(OBJS)\monodll_customdraw.obj: ..\..\src\msw\customdraw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\customdraw.cpp -$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp - $(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp @@ -8597,18 +8594,13 @@ $(OBJS)\monodll_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp +$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp +$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif !if "$(USE_GUI)" == "1" @@ -8637,8 +8629,13 @@ $(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 +$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp !endif !if "$(USE_GUI)" == "1" @@ -10187,9 +10184,6 @@ $(OBJS)\monolib_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp $(OBJS)\monolib_customdraw.obj: ..\..\src\msw\customdraw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\customdraw.cpp -$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp - $(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp @@ -11141,18 +11135,13 @@ $(OBJS)\monolib_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp +$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp +$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif !if "$(USE_GUI)" == "1" @@ -11181,8 +11170,13 @@ $(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 +$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp !endif !if "$(USE_GUI)" == "1" @@ -13145,9 +13139,6 @@ $(OBJS)\coredll_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp $(OBJS)\coredll_customdraw.obj: ..\..\src\msw\customdraw.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\customdraw.cpp -$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp - $(OBJS)\coredll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp @@ -13649,18 +13640,13 @@ $(OBJS)\coredll_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp +$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp +$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif !if "$(USE_GUI)" == "1" @@ -13689,8 +13675,13 @@ $(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 +$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp !endif !if "$(USE_GUI)" == "1" @@ -14876,9 +14867,6 @@ $(OBJS)\corelib_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp $(OBJS)\corelib_customdraw.obj: ..\..\src\msw\customdraw.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\customdraw.cpp -$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp - $(OBJS)\corelib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp @@ -15380,18 +15368,13 @@ $(OBJS)\corelib_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp +$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp +$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp !endif !if "$(USE_GUI)" == "1" @@ -15420,8 +15403,13 @@ $(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 +$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp !endif !if "$(USE_GUI)" == "1" diff --git a/configure b/configure index 83e07fdcc2..41fb46ae93 100755 --- a/configure +++ b/configure @@ -1023,6 +1023,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -1444,6 +1445,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1696,6 +1698,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1833,7 +1844,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1986,6 +1997,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] From 5231dc8bb6e45bf4e87ea935fb5e32c16e7a3fc0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 17 Oct 2018 18:10:05 +0200 Subject: [PATCH 6/6] Rerun autoconf 2.69 to undo changes in the previous commit Remove "runstatedir" addition, probably due to using a newer version of autoconf than is currently used for configure generation. --- configure | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/configure b/configure index 41fb46ae93..83e07fdcc2 100755 --- a/configure +++ b/configure @@ -1023,7 +1023,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1445,7 +1444,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1698,15 +1696,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1844,7 +1833,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1997,7 +1986,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]