Fix compilation with MinGW -std=c++11 option.

[wxWidgets.git] / build / msw / makefile.vc

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 778d85b9b3b5895bd4fe232f0550dbed2202c6c3..10a0982f74c944531a8330dbca9057bec6fa4fb9 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2257,6 +2257,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
+       $(OBJS)\monodll_preferencescmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
        $(OBJS)\monodll_radiobtncmn.obj \\r
@@ -2309,6 +2310,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_msgdlgg.obj \\r
        $(OBJS)\monodll_numdlgg.obj \\r
        $(OBJS)\monodll_progdlgg.obj \\r
+       $(OBJS)\monodll_preferencesg.obj \\r
        $(OBJS)\monodll_printps.obj \\r
        $(OBJS)\monodll_renderg.obj \\r
        $(OBJS)\monodll_richmsgdlgg.obj \\r
@@ -2476,6 +2478,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
+       $(OBJS)\monodll_preferencescmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
        $(OBJS)\monodll_radiobtncmn.obj \\r
@@ -2528,6 +2531,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_msgdlgg.obj \\r
        $(OBJS)\monodll_numdlgg.obj \\r
        $(OBJS)\monodll_progdlgg.obj \\r
+       $(OBJS)\monodll_preferencesg.obj \\r
        $(OBJS)\monodll_printps.obj \\r
        $(OBJS)\monodll_renderg.obj \\r
        $(OBJS)\monodll_richmsgdlgg.obj \\r
@@ -2990,6 +2994,7 @@ ____GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_cocoa_nonownedwnd.obj \\r
        $(OBJS)\monodll_osx_cocoa_notebook.obj \\r
        $(OBJS)\monodll_osx_cocoa_radiobut.obj \\r
+       $(OBJS)\monodll_preferences.obj \\r
        $(OBJS)\monodll_cocoa_printdlg.obj \\r
        $(OBJS)\monodll_osx_cocoa_scrolbar.obj \\r
        $(OBJS)\monodll_osx_cocoa_slider.obj \\r
@@ -3648,6 +3653,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
+       $(OBJS)\monolib_preferencescmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
        $(OBJS)\monolib_radiobtncmn.obj \\r
@@ -3700,6 +3706,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_msgdlgg.obj \\r
        $(OBJS)\monolib_numdlgg.obj \\r
        $(OBJS)\monolib_progdlgg.obj \\r
+       $(OBJS)\monolib_preferencesg.obj \\r
        $(OBJS)\monolib_printps.obj \\r
        $(OBJS)\monolib_renderg.obj \\r
        $(OBJS)\monolib_richmsgdlgg.obj \\r
@@ -3867,6 +3874,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
+       $(OBJS)\monolib_preferencescmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
        $(OBJS)\monolib_radiobtncmn.obj \\r
@@ -3919,6 +3927,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_msgdlgg.obj \\r
        $(OBJS)\monolib_numdlgg.obj \\r
        $(OBJS)\monolib_progdlgg.obj \\r
+       $(OBJS)\monolib_preferencesg.obj \\r
        $(OBJS)\monolib_printps.obj \\r
        $(OBJS)\monolib_renderg.obj \\r
        $(OBJS)\monolib_richmsgdlgg.obj \\r
@@ -4381,6 +4390,7 @@ ____GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_cocoa_nonownedwnd.obj \\r
        $(OBJS)\monolib_osx_cocoa_notebook.obj \\r
        $(OBJS)\monolib_osx_cocoa_radiobut.obj \\r
+       $(OBJS)\monolib_preferences.obj \\r
        $(OBJS)\monolib_cocoa_printdlg.obj \\r
        $(OBJS)\monolib_osx_cocoa_scrolbar.obj \\r
        $(OBJS)\monolib_osx_cocoa_slider.obj \\r
@@ -5004,6 +5014,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
+       $(OBJS)\coredll_preferencescmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
        $(OBJS)\coredll_radiobtncmn.obj \\r
@@ -5056,6 +5067,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_msgdlgg.obj \\r
        $(OBJS)\coredll_numdlgg.obj \\r
        $(OBJS)\coredll_progdlgg.obj \\r
+       $(OBJS)\coredll_preferencesg.obj \\r
        $(OBJS)\coredll_printps.obj \\r
        $(OBJS)\coredll_renderg.obj \\r
        $(OBJS)\coredll_richmsgdlgg.obj \\r
@@ -5223,6 +5235,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
+       $(OBJS)\coredll_preferencescmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
        $(OBJS)\coredll_radiobtncmn.obj \\r
@@ -5275,6 +5288,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_msgdlgg.obj \\r
        $(OBJS)\coredll_numdlgg.obj \\r
        $(OBJS)\coredll_progdlgg.obj \\r
+       $(OBJS)\coredll_preferencesg.obj \\r
        $(OBJS)\coredll_printps.obj \\r
        $(OBJS)\coredll_renderg.obj \\r
        $(OBJS)\coredll_richmsgdlgg.obj \\r
@@ -5737,6 +5751,7 @@ ____GUI_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_cocoa_nonownedwnd.obj \\r
        $(OBJS)\coredll_osx_cocoa_notebook.obj \\r
        $(OBJS)\coredll_osx_cocoa_radiobut.obj \\r
+       $(OBJS)\coredll_preferences.obj \\r
        $(OBJS)\coredll_cocoa_printdlg.obj \\r
        $(OBJS)\coredll_osx_cocoa_scrolbar.obj \\r
        $(OBJS)\coredll_osx_cocoa_slider.obj \\r
@@ -6050,6 +6065,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
+       $(OBJS)\corelib_preferencescmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
        $(OBJS)\corelib_radiobtncmn.obj \\r
@@ -6102,6 +6118,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_msgdlgg.obj \\r
        $(OBJS)\corelib_numdlgg.obj \\r
        $(OBJS)\corelib_progdlgg.obj \\r
+       $(OBJS)\corelib_preferencesg.obj \\r
        $(OBJS)\corelib_printps.obj \\r
        $(OBJS)\corelib_renderg.obj \\r
        $(OBJS)\corelib_richmsgdlgg.obj \\r
@@ -6269,6 +6286,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
+       $(OBJS)\corelib_preferencescmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
        $(OBJS)\corelib_radiobtncmn.obj \\r
@@ -6321,6 +6339,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_msgdlgg.obj \\r
        $(OBJS)\corelib_numdlgg.obj \\r
        $(OBJS)\corelib_progdlgg.obj \\r
+       $(OBJS)\corelib_preferencesg.obj \\r
        $(OBJS)\corelib_printps.obj \\r
        $(OBJS)\corelib_renderg.obj \\r
        $(OBJS)\corelib_richmsgdlgg.obj \\r
@@ -6783,6 +6802,7 @@ ____GUI_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_cocoa_nonownedwnd.obj \\r
        $(OBJS)\corelib_osx_cocoa_notebook.obj \\r
        $(OBJS)\corelib_osx_cocoa_radiobut.obj \\r
+       $(OBJS)\corelib_preferences.obj \\r
        $(OBJS)\corelib_cocoa_printdlg.obj \\r
        $(OBJS)\corelib_osx_cocoa_scrolbar.obj \\r
        $(OBJS)\corelib_osx_cocoa_slider.obj \\r
@@ -12155,6 +12175,8 @@ $(OBJS)\monodll_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 \r
 $(OBJS)\monodll_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm\r
 \r
+$(OBJS)\monodll_preferences.obj: ..\..\src\osx\cocoa\preferences.mm\r
+\r
 $(OBJS)\monodll_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm\r
 \r
 $(OBJS)\monodll_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm\r
@@ -15849,6 +15871,11 @@ $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
@@ -16109,6 +16136,11 @@ $(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\printps.cpp\r
@@ -17668,6 +17700,8 @@ $(OBJS)\monolib_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 \r
 $(OBJS)\monolib_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm\r
 \r
+$(OBJS)\monolib_preferences.obj: ..\..\src\osx\cocoa\preferences.mm\r
+\r
 $(OBJS)\monolib_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm\r
 \r
 $(OBJS)\monolib_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm\r
@@ -21362,6 +21396,11 @@ $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
@@ -21622,6 +21661,11 @@ $(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\printps.cpp\r
@@ -23614,6 +23658,8 @@ $(OBJS)\coredll_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 \r
 $(OBJS)\coredll_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm\r
 \r
+$(OBJS)\coredll_preferences.obj: ..\..\src\osx\cocoa\preferences.mm\r
+\r
 $(OBJS)\coredll_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm\r
 \r
 $(OBJS)\coredll_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm\r
@@ -26872,6 +26918,11 @@ $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
@@ -27132,6 +27183,11 @@ $(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\printps.cpp\r
@@ -27691,6 +27747,8 @@ $(OBJS)\corelib_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 \r
 $(OBJS)\corelib_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm\r
 \r
+$(OBJS)\corelib_preferences.obj: ..\..\src\osx\cocoa\preferences.mm\r
+\r
 $(OBJS)\corelib_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm\r
 \r
 $(OBJS)\corelib_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm\r
@@ -30949,6 +31007,11 @@ $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
@@ -31209,6 +31272,11 @@ $(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\printps.cpp\r