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

wxComboControl and wxOwnerDrawnComboBox (patch 1479938)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-08 23:42:45 +00:00
parent cd4e32afe7
commit a340b80d8a
27 changed files with 6416 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/bakefiles/files.bkl
View File

@@ -553,6 +553,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/choiccmn.cpp
src/common/clipcmn.cpp
src/common/colourcmn.cpp
src/common/combocmn.cpp
src/common/cmdproc.cpp
src/common/cmndata.cpp
src/common/containr.cpp
@@ -623,6 +624,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/busyinfo.cpp
src/generic/choicdgg.cpp
src/generic/choicbkg.cpp
src/generic/combog.cpp
src/generic/dcpsg.cpp
src/generic/dirctrlg.cpp
src/generic/dragimgg.cpp
@@ -654,6 +656,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/choicdlg.h
wx/choice.h
wx/cmndata.h
wx/combo.h
wx/combobox.h
wx/control.h
wx/ctrlsub.h
@@ -675,6 +678,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/accel.h
wx/generic/choicdgg.h
wx/generic/colrdlgg.h
wx/generic/combo.h
wx/generic/dcpsg.h
wx/generic/dirctrlg.h
wx/generic/dragimgg.h
@@ -1481,6 +1485,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/checkbox.cpp
src/msw/choice.cpp
src/msw/colordlg.cpp
src/msw/combo.cpp
src/msw/combobox.cpp
src/msw/control.cpp
src/msw/dialog.cpp
@@ -1532,6 +1537,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/clipbrd.h
wx/msw/colordlg.h
wx/msw/colour.h
wx/msw/combo.h
wx/msw/combobox.h
wx/msw/control.h
wx/msw/cursor.h
@@ -2518,6 +2524,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/gridsel.cpp
src/generic/helpext.cpp
src/generic/laywin.cpp
src/generic/odcombo.cpp
src/generic/propdlg.cpp
src/generic/sashwin.cpp
src/generic/splash.cpp
@@ -2551,6 +2558,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/grid.h
wx/joystick.h
wx/laywin.h
wx/odcombo.h
wx/propdlg.h
wx/sashwin.h
wx/sound.h

96
build/msw/makefile.bcc
View File

@@ -1203,6 +1203,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_checkbox.obj \
$(OBJS)\monodll_choice.obj \
$(OBJS)\monodll_colordlg.obj \
$(OBJS)\monodll_combo.obj \
$(OBJS)\monodll_combobox.obj \
$(OBJS)\monodll_control.obj \
$(OBJS)\monodll_dialog.obj \
@@ -1252,6 +1253,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_choiccmn.obj \
$(OBJS)\monodll_clipcmn.obj \
$(OBJS)\monodll_colourcmn.obj \
$(OBJS)\monodll_combocmn.obj \
$(OBJS)\monodll_cmdproc.obj \
$(OBJS)\monodll_cmndata.obj \
$(OBJS)\monodll_containr.obj \
@@ -1322,6 +1324,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_busyinfo.obj \
$(OBJS)\monodll_choicdgg.obj \
$(OBJS)\monodll_choicbkg.obj \
$(OBJS)\monodll_combog.obj \
$(OBJS)\monodll_dcpsg.obj \
$(OBJS)\monodll_dirctrlg.obj \
$(OBJS)\monodll_dragimgg.obj \
@@ -1452,6 +1455,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_choiccmn.obj \
$(OBJS)\monodll_clipcmn.obj \
$(OBJS)\monodll_colourcmn.obj \
$(OBJS)\monodll_combocmn.obj \
$(OBJS)\monodll_cmdproc.obj \
$(OBJS)\monodll_cmndata.obj \
$(OBJS)\monodll_containr.obj \
@@ -1522,6 +1526,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_busyinfo.obj \
$(OBJS)\monodll_choicdgg.obj \
$(OBJS)\monodll_choicbkg.obj \
$(OBJS)\monodll_combog.obj \
$(OBJS)\monodll_dcpsg.obj \
$(OBJS)\monodll_dirctrlg.obj \
$(OBJS)\monodll_dragimgg.obj \
@@ -1556,6 +1561,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gridsel.obj \
$(OBJS)\monodll_helpext.obj \
$(OBJS)\monodll_laywin.obj \
$(OBJS)\monodll_odcombo.obj \
$(OBJS)\monodll_propdlg.obj \
$(OBJS)\monodll_sashwin.obj \
$(OBJS)\monodll_splash.obj \
@@ -1584,6 +1590,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gridsel.obj \
$(OBJS)\monodll_helpext.obj \
$(OBJS)\monodll_laywin.obj \
$(OBJS)\monodll_odcombo.obj \
$(OBJS)\monodll_propdlg.obj \
$(OBJS)\monodll_sashwin.obj \
$(OBJS)\monodll_splash.obj \
@@ -1744,6 +1751,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_checkbox.obj \
$(OBJS)\monolib_choice.obj \
$(OBJS)\monolib_colordlg.obj \
$(OBJS)\monolib_combo.obj \
$(OBJS)\monolib_combobox.obj \
$(OBJS)\monolib_control.obj \
$(OBJS)\monolib_dialog.obj \
@@ -1793,6 +1801,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_choiccmn.obj \
$(OBJS)\monolib_clipcmn.obj \
$(OBJS)\monolib_colourcmn.obj \
$(OBJS)\monolib_combocmn.obj \
$(OBJS)\monolib_cmdproc.obj \
$(OBJS)\monolib_cmndata.obj \
$(OBJS)\monolib_containr.obj \
@@ -1863,6 +1872,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_busyinfo.obj \
$(OBJS)\monolib_choicdgg.obj \
$(OBJS)\monolib_choicbkg.obj \
$(OBJS)\monolib_combog.obj \
$(OBJS)\monolib_dcpsg.obj \
$(OBJS)\monolib_dirctrlg.obj \
$(OBJS)\monolib_dragimgg.obj \
@@ -1993,6 +2003,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_choiccmn.obj \
$(OBJS)\monolib_clipcmn.obj \
$(OBJS)\monolib_colourcmn.obj \
$(OBJS)\monolib_combocmn.obj \
$(OBJS)\monolib_cmdproc.obj \
$(OBJS)\monolib_cmndata.obj \
$(OBJS)\monolib_containr.obj \
@@ -2063,6 +2074,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_busyinfo.obj \
$(OBJS)\monolib_choicdgg.obj \
$(OBJS)\monolib_choicbkg.obj \
$(OBJS)\monolib_combog.obj \
$(OBJS)\monolib_dcpsg.obj \
$(OBJS)\monolib_dirctrlg.obj \
$(OBJS)\monolib_dragimgg.obj \
@@ -2097,6 +2109,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gridsel.obj \
$(OBJS)\monolib_helpext.obj \
$(OBJS)\monolib_laywin.obj \
$(OBJS)\monolib_odcombo.obj \
$(OBJS)\monolib_propdlg.obj \
$(OBJS)\monolib_sashwin.obj \
$(OBJS)\monolib_splash.obj \
@@ -2125,6 +2138,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gridsel.obj \
$(OBJS)\monolib_helpext.obj \
$(OBJS)\monolib_laywin.obj \
$(OBJS)\monolib_odcombo.obj \
$(OBJS)\monolib_propdlg.obj \
$(OBJS)\monolib_sashwin.obj \
$(OBJS)\monolib_splash.obj \
@@ -2218,6 +2232,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_checkbox.obj \
$(OBJS)\coredll_choice.obj \
$(OBJS)\coredll_colordlg.obj \
$(OBJS)\coredll_combo.obj \
$(OBJS)\coredll_combobox.obj \
$(OBJS)\coredll_control.obj \
$(OBJS)\coredll_dialog.obj \
@@ -2267,6 +2282,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_choiccmn.obj \
$(OBJS)\coredll_clipcmn.obj \
$(OBJS)\coredll_colourcmn.obj \
$(OBJS)\coredll_combocmn.obj \
$(OBJS)\coredll_cmdproc.obj \
$(OBJS)\coredll_cmndata.obj \
$(OBJS)\coredll_containr.obj \
@@ -2337,6 +2353,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_busyinfo.obj \
$(OBJS)\coredll_choicdgg.obj \
$(OBJS)\coredll_choicbkg.obj \
$(OBJS)\coredll_combog.obj \
$(OBJS)\coredll_dcpsg.obj \
$(OBJS)\coredll_dirctrlg.obj \
$(OBJS)\coredll_dragimgg.obj \
@@ -2467,6 +2484,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_choiccmn.obj \
$(OBJS)\coredll_clipcmn.obj \
$(OBJS)\coredll_colourcmn.obj \
$(OBJS)\coredll_combocmn.obj \
$(OBJS)\coredll_cmdproc.obj \
$(OBJS)\coredll_cmndata.obj \
$(OBJS)\coredll_containr.obj \
@@ -2537,6 +2555,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_busyinfo.obj \
$(OBJS)\coredll_choicdgg.obj \
$(OBJS)\coredll_choicbkg.obj \
$(OBJS)\coredll_combog.obj \
$(OBJS)\coredll_dcpsg.obj \
$(OBJS)\coredll_dirctrlg.obj \
$(OBJS)\coredll_dragimgg.obj \
@@ -2621,6 +2640,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_checkbox.obj \
$(OBJS)\corelib_choice.obj \
$(OBJS)\corelib_colordlg.obj \
$(OBJS)\corelib_combo.obj \
$(OBJS)\corelib_combobox.obj \
$(OBJS)\corelib_control.obj \
$(OBJS)\corelib_dialog.obj \
@@ -2670,6 +2690,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_choiccmn.obj \
$(OBJS)\corelib_clipcmn.obj \
$(OBJS)\corelib_colourcmn.obj \
$(OBJS)\corelib_combocmn.obj \
$(OBJS)\corelib_cmdproc.obj \
$(OBJS)\corelib_cmndata.obj \
$(OBJS)\corelib_containr.obj \
@@ -2740,6 +2761,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_busyinfo.obj \
$(OBJS)\corelib_choicdgg.obj \
$(OBJS)\corelib_choicbkg.obj \
$(OBJS)\corelib_combog.obj \
$(OBJS)\corelib_dcpsg.obj \
$(OBJS)\corelib_dirctrlg.obj \
$(OBJS)\corelib_dragimgg.obj \
@@ -2870,6 +2892,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_choiccmn.obj \
$(OBJS)\corelib_clipcmn.obj \
$(OBJS)\corelib_colourcmn.obj \
$(OBJS)\corelib_combocmn.obj \
$(OBJS)\corelib_cmdproc.obj \
$(OBJS)\corelib_cmndata.obj \
$(OBJS)\corelib_containr.obj \
@@ -2940,6 +2963,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_busyinfo.obj \
$(OBJS)\corelib_choicdgg.obj \
$(OBJS)\corelib_choicbkg.obj \
$(OBJS)\corelib_combog.obj \
$(OBJS)\corelib_dcpsg.obj \
$(OBJS)\corelib_dirctrlg.obj \
$(OBJS)\corelib_dragimgg.obj \
@@ -2978,6 +3002,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_gridsel.obj \
$(OBJS)\advdll_helpext.obj \
$(OBJS)\advdll_laywin.obj \
$(OBJS)\advdll_odcombo.obj \
$(OBJS)\advdll_propdlg.obj \
$(OBJS)\advdll_sashwin.obj \
$(OBJS)\advdll_splash.obj \
@@ -3006,6 +3031,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_gridsel.obj \
$(OBJS)\advdll_helpext.obj \
$(OBJS)\advdll_laywin.obj \
$(OBJS)\advdll_odcombo.obj \
$(OBJS)\advdll_propdlg.obj \
$(OBJS)\advdll_sashwin.obj \
$(OBJS)\advdll_splash.obj \
@@ -3037,6 +3063,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_gridsel.obj \
$(OBJS)\advlib_helpext.obj \
$(OBJS)\advlib_laywin.obj \
$(OBJS)\advlib_odcombo.obj \
$(OBJS)\advlib_propdlg.obj \
$(OBJS)\advlib_sashwin.obj \
$(OBJS)\advlib_splash.obj \
@@ -3065,6 +3092,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_gridsel.obj \
$(OBJS)\advlib_helpext.obj \
$(OBJS)\advlib_laywin.obj \
$(OBJS)\advlib_odcombo.obj \
$(OBJS)\advlib_propdlg.obj \
$(OBJS)\advlib_sashwin.obj \
$(OBJS)\advlib_splash.obj \
@@ -4334,6 +4362,9 @@ $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5249,6 +5280,11 @@ $(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5599,6 +5635,11 @@ $(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5754,6 +5795,11 @@ $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6100,6 +6146,9 @@ $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7015,6 +7064,11 @@ $(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7365,6 +7419,11 @@ $(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7520,6 +7579,11 @@ $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8178,6 +8242,9 @@ $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
$(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -8850,6 +8917,11 @@ $(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9200,6 +9272,11 @@ $(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9332,6 +9409,9 @@ $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
$(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10004,6 +10084,11 @@ $(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10354,6 +10439,11 @@ $(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10498,6 +10588,9 @@ $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
$(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
$(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
@@ -10576,6 +10669,9 @@ $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
$(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
$(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**

96
build/msw/makefile.gcc
View File

@@ -1214,6 +1214,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_checkbox.o \
$(OBJS)\monodll_choice.o \
$(OBJS)\monodll_colordlg.o \
$(OBJS)\monodll_combo.o \
$(OBJS)\monodll_combobox.o \
$(OBJS)\monodll_control.o \
$(OBJS)\monodll_dialog.o \
@@ -1263,6 +1264,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_choiccmn.o \
$(OBJS)\monodll_clipcmn.o \
$(OBJS)\monodll_colourcmn.o \
$(OBJS)\monodll_combocmn.o \
$(OBJS)\monodll_cmdproc.o \
$(OBJS)\monodll_cmndata.o \
$(OBJS)\monodll_containr.o \
@@ -1333,6 +1335,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_busyinfo.o \
$(OBJS)\monodll_choicdgg.o \
$(OBJS)\monodll_choicbkg.o \
$(OBJS)\monodll_combog.o \
$(OBJS)\monodll_dcpsg.o \
$(OBJS)\monodll_dirctrlg.o \
$(OBJS)\monodll_dragimgg.o \
@@ -1465,6 +1468,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_choiccmn.o \
$(OBJS)\monodll_clipcmn.o \
$(OBJS)\monodll_colourcmn.o \
$(OBJS)\monodll_combocmn.o \
$(OBJS)\monodll_cmdproc.o \
$(OBJS)\monodll_cmndata.o \
$(OBJS)\monodll_containr.o \
@@ -1535,6 +1539,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_busyinfo.o \
$(OBJS)\monodll_choicdgg.o \
$(OBJS)\monodll_choicbkg.o \
$(OBJS)\monodll_combog.o \
$(OBJS)\monodll_dcpsg.o \
$(OBJS)\monodll_dirctrlg.o \
$(OBJS)\monodll_dragimgg.o \
@@ -1570,6 +1575,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gridsel.o \
$(OBJS)\monodll_helpext.o \
$(OBJS)\monodll_laywin.o \
$(OBJS)\monodll_odcombo.o \
$(OBJS)\monodll_propdlg.o \
$(OBJS)\monodll_sashwin.o \
$(OBJS)\monodll_splash.o \
@@ -1598,6 +1604,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gridsel.o \
$(OBJS)\monodll_helpext.o \
$(OBJS)\monodll_laywin.o \
$(OBJS)\monodll_odcombo.o \
$(OBJS)\monodll_propdlg.o \
$(OBJS)\monodll_sashwin.o \
$(OBJS)\monodll_splash.o \
@@ -1761,6 +1768,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_checkbox.o \
$(OBJS)\monolib_choice.o \
$(OBJS)\monolib_colordlg.o \
$(OBJS)\monolib_combo.o \
$(OBJS)\monolib_combobox.o \
$(OBJS)\monolib_control.o \
$(OBJS)\monolib_dialog.o \
@@ -1810,6 +1818,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_choiccmn.o \
$(OBJS)\monolib_clipcmn.o \
$(OBJS)\monolib_colourcmn.o \
$(OBJS)\monolib_combocmn.o \
$(OBJS)\monolib_cmdproc.o \
$(OBJS)\monolib_cmndata.o \
$(OBJS)\monolib_containr.o \
@@ -1880,6 +1889,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_busyinfo.o \
$(OBJS)\monolib_choicdgg.o \
$(OBJS)\monolib_choicbkg.o \
$(OBJS)\monolib_combog.o \
$(OBJS)\monolib_dcpsg.o \
$(OBJS)\monolib_dirctrlg.o \
$(OBJS)\monolib_dragimgg.o \
@@ -2012,6 +2022,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_choiccmn.o \
$(OBJS)\monolib_clipcmn.o \
$(OBJS)\monolib_colourcmn.o \
$(OBJS)\monolib_combocmn.o \
$(OBJS)\monolib_cmdproc.o \
$(OBJS)\monolib_cmndata.o \
$(OBJS)\monolib_containr.o \
@@ -2082,6 +2093,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_busyinfo.o \
$(OBJS)\monolib_choicdgg.o \
$(OBJS)\monolib_choicbkg.o \
$(OBJS)\monolib_combog.o \
$(OBJS)\monolib_dcpsg.o \
$(OBJS)\monolib_dirctrlg.o \
$(OBJS)\monolib_dragimgg.o \
@@ -2117,6 +2129,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gridsel.o \
$(OBJS)\monolib_helpext.o \
$(OBJS)\monolib_laywin.o \
$(OBJS)\monolib_odcombo.o \
$(OBJS)\monolib_propdlg.o \
$(OBJS)\monolib_sashwin.o \
$(OBJS)\monolib_splash.o \
@@ -2145,6 +2158,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gridsel.o \
$(OBJS)\monolib_helpext.o \
$(OBJS)\monolib_laywin.o \
$(OBJS)\monolib_odcombo.o \
$(OBJS)\monolib_propdlg.o \
$(OBJS)\monolib_sashwin.o \
$(OBJS)\monolib_splash.o \
@@ -2251,6 +2265,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_checkbox.o \
$(OBJS)\coredll_choice.o \
$(OBJS)\coredll_colordlg.o \
$(OBJS)\coredll_combo.o \
$(OBJS)\coredll_combobox.o \
$(OBJS)\coredll_control.o \
$(OBJS)\coredll_dialog.o \
@@ -2300,6 +2315,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_choiccmn.o \
$(OBJS)\coredll_clipcmn.o \
$(OBJS)\coredll_colourcmn.o \
$(OBJS)\coredll_combocmn.o \
$(OBJS)\coredll_cmdproc.o \
$(OBJS)\coredll_cmndata.o \
$(OBJS)\coredll_containr.o \
@@ -2370,6 +2386,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_busyinfo.o \
$(OBJS)\coredll_choicdgg.o \
$(OBJS)\coredll_choicbkg.o \
$(OBJS)\coredll_combog.o \
$(OBJS)\coredll_dcpsg.o \
$(OBJS)\coredll_dirctrlg.o \
$(OBJS)\coredll_dragimgg.o \
@@ -2502,6 +2519,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_choiccmn.o \
$(OBJS)\coredll_clipcmn.o \
$(OBJS)\coredll_colourcmn.o \
$(OBJS)\coredll_combocmn.o \
$(OBJS)\coredll_cmdproc.o \
$(OBJS)\coredll_cmndata.o \
$(OBJS)\coredll_containr.o \
@@ -2572,6 +2590,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_busyinfo.o \
$(OBJS)\coredll_choicdgg.o \
$(OBJS)\coredll_choicbkg.o \
$(OBJS)\coredll_combog.o \
$(OBJS)\coredll_dcpsg.o \
$(OBJS)\coredll_dirctrlg.o \
$(OBJS)\coredll_dragimgg.o \
@@ -2662,6 +2681,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_checkbox.o \
$(OBJS)\corelib_choice.o \
$(OBJS)\corelib_colordlg.o \
$(OBJS)\corelib_combo.o \
$(OBJS)\corelib_combobox.o \
$(OBJS)\corelib_control.o \
$(OBJS)\corelib_dialog.o \
@@ -2711,6 +2731,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_choiccmn.o \
$(OBJS)\corelib_clipcmn.o \
$(OBJS)\corelib_colourcmn.o \
$(OBJS)\corelib_combocmn.o \
$(OBJS)\corelib_cmdproc.o \
$(OBJS)\corelib_cmndata.o \
$(OBJS)\corelib_containr.o \
@@ -2781,6 +2802,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_busyinfo.o \
$(OBJS)\corelib_choicdgg.o \
$(OBJS)\corelib_choicbkg.o \
$(OBJS)\corelib_combog.o \
$(OBJS)\corelib_dcpsg.o \
$(OBJS)\corelib_dirctrlg.o \
$(OBJS)\corelib_dragimgg.o \
@@ -2913,6 +2935,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_choiccmn.o \
$(OBJS)\corelib_clipcmn.o \
$(OBJS)\corelib_colourcmn.o \
$(OBJS)\corelib_combocmn.o \
$(OBJS)\corelib_cmdproc.o \
$(OBJS)\corelib_cmndata.o \
$(OBJS)\corelib_containr.o \
@@ -2983,6 +3006,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_busyinfo.o \
$(OBJS)\corelib_choicdgg.o \
$(OBJS)\corelib_choicbkg.o \
$(OBJS)\corelib_combog.o \
$(OBJS)\corelib_dcpsg.o \
$(OBJS)\corelib_dirctrlg.o \
$(OBJS)\corelib_dragimgg.o \
@@ -3026,6 +3050,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_gridsel.o \
$(OBJS)\advdll_helpext.o \
$(OBJS)\advdll_laywin.o \
$(OBJS)\advdll_odcombo.o \
$(OBJS)\advdll_propdlg.o \
$(OBJS)\advdll_sashwin.o \
$(OBJS)\advdll_splash.o \
@@ -3054,6 +3079,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_gridsel.o \
$(OBJS)\advdll_helpext.o \
$(OBJS)\advdll_laywin.o \
$(OBJS)\advdll_odcombo.o \
$(OBJS)\advdll_propdlg.o \
$(OBJS)\advdll_sashwin.o \
$(OBJS)\advdll_splash.o \
@@ -3089,6 +3115,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_gridsel.o \
$(OBJS)\advlib_helpext.o \
$(OBJS)\advlib_laywin.o \
$(OBJS)\advlib_odcombo.o \
$(OBJS)\advlib_propdlg.o \
$(OBJS)\advlib_sashwin.o \
$(OBJS)\advlib_splash.o \
@@ -3117,6 +3144,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_gridsel.o \
$(OBJS)\advlib_helpext.o \
$(OBJS)\advlib_laywin.o \
$(OBJS)\advlib_odcombo.o \
$(OBJS)\advlib_propdlg.o \
$(OBJS)\advlib_sashwin.o \
$(OBJS)\advlib_splash.o \
@@ -4438,6 +4466,9 @@ $(OBJS)\monodll_urlmsw.o: ../../src/msw/urlmsw.cpp
$(OBJS)\monodll_colordlg.o: ../../src/msw/colordlg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_combo.o: ../../src/msw/combo.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_dirdlg.o: ../../src/msw/dirdlg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -5453,6 +5484,11 @@ $(OBJS)\monodll_colourcmn.o: ../../src/common/colourcmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_combocmn.o: ../../src/common/combocmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_cmdproc.o: ../../src/common/cmdproc.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -5803,6 +5839,11 @@ $(OBJS)\monodll_choicbkg.o: ../../src/generic/choicbkg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_combog.o: ../../src/generic/combog.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_dcpsg.o: ../../src/generic/dcpsg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -5958,6 +5999,11 @@ $(OBJS)\monodll_laywin.o: ../../src/generic/laywin.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_odcombo.o: ../../src/generic/odcombo.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_propdlg.o: ../../src/generic/propdlg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -6304,6 +6350,9 @@ $(OBJS)\monolib_urlmsw.o: ../../src/msw/urlmsw.cpp
$(OBJS)\monolib_colordlg.o: ../../src/msw/colordlg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_combo.o: ../../src/msw/combo.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_dirdlg.o: ../../src/msw/dirdlg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -7319,6 +7368,11 @@ $(OBJS)\monolib_colourcmn.o: ../../src/common/colourcmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_combocmn.o: ../../src/common/combocmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_cmdproc.o: ../../src/common/cmdproc.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -7669,6 +7723,11 @@ $(OBJS)\monolib_choicbkg.o: ../../src/generic/choicbkg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_combog.o: ../../src/generic/combog.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_dcpsg.o: ../../src/generic/dcpsg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -7824,6 +7883,11 @@ $(OBJS)\monolib_laywin.o: ../../src/generic/laywin.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_odcombo.o: ../../src/generic/odcombo.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_propdlg.o: ../../src/generic/propdlg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -8482,6 +8546,9 @@ $(OBJS)\coredll_volume.o: ../../src/msw/volume.cpp
$(OBJS)\coredll_colordlg.o: ../../src/msw/colordlg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_combo.o: ../../src/msw/combo.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_dirdlg.o: ../../src/msw/dirdlg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9254,6 +9321,11 @@ $(OBJS)\coredll_colourcmn.o: ../../src/common/colourcmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_combocmn.o: ../../src/common/combocmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_cmdproc.o: ../../src/common/cmdproc.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9604,6 +9676,11 @@ $(OBJS)\coredll_choicbkg.o: ../../src/generic/choicbkg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_combog.o: ../../src/generic/combog.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_dcpsg.o: ../../src/generic/dcpsg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9736,6 +9813,9 @@ $(OBJS)\corelib_volume.o: ../../src/msw/volume.cpp
$(OBJS)\corelib_colordlg.o: ../../src/msw/colordlg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_combo.o: ../../src/msw/combo.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_dirdlg.o: ../../src/msw/dirdlg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10508,6 +10588,11 @@ $(OBJS)\corelib_colourcmn.o: ../../src/common/colourcmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_combocmn.o: ../../src/common/combocmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_cmdproc.o: ../../src/common/cmdproc.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10858,6 +10943,11 @@ $(OBJS)\corelib_choicbkg.o: ../../src/generic/choicbkg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_combog.o: ../../src/generic/combog.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_dcpsg.o: ../../src/generic/dcpsg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11002,6 +11092,9 @@ $(OBJS)\advdll_helpext.o: ../../src/generic/helpext.cpp
$(OBJS)\advdll_laywin.o: ../../src/generic/laywin.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_odcombo.o: ../../src/generic/odcombo.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_propdlg.o: ../../src/generic/propdlg.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11080,6 +11173,9 @@ $(OBJS)\advlib_helpext.o: ../../src/generic/helpext.cpp
$(OBJS)\advlib_laywin.o: ../../src/generic/laywin.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_odcombo.o: ../../src/generic/odcombo.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_propdlg.o: ../../src/generic/propdlg.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<

96
build/msw/makefile.vc
View File

@@ -1362,6 +1362,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_checkbox.obj \
$(OBJS)\monodll_choice.obj \
$(OBJS)\monodll_colordlg.obj \
$(OBJS)\monodll_combo.obj \
$(OBJS)\monodll_combobox.obj \
$(OBJS)\monodll_control.obj \
$(OBJS)\monodll_dialog.obj \
@@ -1411,6 +1412,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_choiccmn.obj \
$(OBJS)\monodll_clipcmn.obj \
$(OBJS)\monodll_colourcmn.obj \
$(OBJS)\monodll_combocmn.obj \
$(OBJS)\monodll_cmdproc.obj \
$(OBJS)\monodll_cmndata.obj \
$(OBJS)\monodll_containr.obj \
@@ -1481,6 +1483,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_busyinfo.obj \
$(OBJS)\monodll_choicdgg.obj \
$(OBJS)\monodll_choicbkg.obj \
$(OBJS)\monodll_combog.obj \
$(OBJS)\monodll_dcpsg.obj \
$(OBJS)\monodll_dirctrlg.obj \
$(OBJS)\monodll_dragimgg.obj \
@@ -1611,6 +1614,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_choiccmn.obj \
$(OBJS)\monodll_clipcmn.obj \
$(OBJS)\monodll_colourcmn.obj \
$(OBJS)\monodll_combocmn.obj \
$(OBJS)\monodll_cmdproc.obj \
$(OBJS)\monodll_cmndata.obj \
$(OBJS)\monodll_containr.obj \
@@ -1681,6 +1685,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_busyinfo.obj \
$(OBJS)\monodll_choicdgg.obj \
$(OBJS)\monodll_choicbkg.obj \
$(OBJS)\monodll_combog.obj \
$(OBJS)\monodll_dcpsg.obj \
$(OBJS)\monodll_dirctrlg.obj \
$(OBJS)\monodll_dragimgg.obj \
@@ -1715,6 +1720,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gridsel.obj \
$(OBJS)\monodll_helpext.obj \
$(OBJS)\monodll_laywin.obj \
$(OBJS)\monodll_odcombo.obj \
$(OBJS)\monodll_propdlg.obj \
$(OBJS)\monodll_sashwin.obj \
$(OBJS)\monodll_splash.obj \
@@ -1743,6 +1749,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gridsel.obj \
$(OBJS)\monodll_helpext.obj \
$(OBJS)\monodll_laywin.obj \
$(OBJS)\monodll_odcombo.obj \
$(OBJS)\monodll_propdlg.obj \
$(OBJS)\monodll_sashwin.obj \
$(OBJS)\monodll_splash.obj \
@@ -1909,6 +1916,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_checkbox.obj \
$(OBJS)\monolib_choice.obj \
$(OBJS)\monolib_colordlg.obj \
$(OBJS)\monolib_combo.obj \
$(OBJS)\monolib_combobox.obj \
$(OBJS)\monolib_control.obj \
$(OBJS)\monolib_dialog.obj \
@@ -1958,6 +1966,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_choiccmn.obj \
$(OBJS)\monolib_clipcmn.obj \
$(OBJS)\monolib_colourcmn.obj \
$(OBJS)\monolib_combocmn.obj \
$(OBJS)\monolib_cmdproc.obj \
$(OBJS)\monolib_cmndata.obj \
$(OBJS)\monolib_containr.obj \
@@ -2028,6 +2037,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_busyinfo.obj \
$(OBJS)\monolib_choicdgg.obj \
$(OBJS)\monolib_choicbkg.obj \
$(OBJS)\monolib_combog.obj \
$(OBJS)\monolib_dcpsg.obj \
$(OBJS)\monolib_dirctrlg.obj \
$(OBJS)\monolib_dragimgg.obj \
@@ -2158,6 +2168,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_choiccmn.obj \
$(OBJS)\monolib_clipcmn.obj \
$(OBJS)\monolib_colourcmn.obj \
$(OBJS)\monolib_combocmn.obj \
$(OBJS)\monolib_cmdproc.obj \
$(OBJS)\monolib_cmndata.obj \
$(OBJS)\monolib_containr.obj \
@@ -2228,6 +2239,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_busyinfo.obj \
$(OBJS)\monolib_choicdgg.obj \
$(OBJS)\monolib_choicbkg.obj \
$(OBJS)\monolib_combog.obj \
$(OBJS)\monolib_dcpsg.obj \
$(OBJS)\monolib_dirctrlg.obj \
$(OBJS)\monolib_dragimgg.obj \
@@ -2262,6 +2274,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gridsel.obj \
$(OBJS)\monolib_helpext.obj \
$(OBJS)\monolib_laywin.obj \
$(OBJS)\monolib_odcombo.obj \
$(OBJS)\monolib_propdlg.obj \
$(OBJS)\monolib_sashwin.obj \
$(OBJS)\monolib_splash.obj \
@@ -2290,6 +2303,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gridsel.obj \
$(OBJS)\monolib_helpext.obj \
$(OBJS)\monolib_laywin.obj \
$(OBJS)\monolib_odcombo.obj \
$(OBJS)\monolib_propdlg.obj \
$(OBJS)\monolib_sashwin.obj \
$(OBJS)\monolib_splash.obj \
@@ -2413,6 +2427,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_checkbox.obj \
$(OBJS)\coredll_choice.obj \
$(OBJS)\coredll_colordlg.obj \
$(OBJS)\coredll_combo.obj \
$(OBJS)\coredll_combobox.obj \
$(OBJS)\coredll_control.obj \
$(OBJS)\coredll_dialog.obj \
@@ -2462,6 +2477,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_choiccmn.obj \
$(OBJS)\coredll_clipcmn.obj \
$(OBJS)\coredll_colourcmn.obj \
$(OBJS)\coredll_combocmn.obj \
$(OBJS)\coredll_cmdproc.obj \
$(OBJS)\coredll_cmndata.obj \
$(OBJS)\coredll_containr.obj \
@@ -2532,6 +2548,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_busyinfo.obj \
$(OBJS)\coredll_choicdgg.obj \
$(OBJS)\coredll_choicbkg.obj \
$(OBJS)\coredll_combog.obj \
$(OBJS)\coredll_dcpsg.obj \
$(OBJS)\coredll_dirctrlg.obj \
$(OBJS)\coredll_dragimgg.obj \
@@ -2662,6 +2679,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_choiccmn.obj \
$(OBJS)\coredll_clipcmn.obj \
$(OBJS)\coredll_colourcmn.obj \
$(OBJS)\coredll_combocmn.obj \
$(OBJS)\coredll_cmdproc.obj \
$(OBJS)\coredll_cmndata.obj \
$(OBJS)\coredll_containr.obj \
@@ -2732,6 +2750,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_busyinfo.obj \
$(OBJS)\coredll_choicdgg.obj \
$(OBJS)\coredll_choicbkg.obj \
$(OBJS)\coredll_combog.obj \
$(OBJS)\coredll_dcpsg.obj \
$(OBJS)\coredll_dirctrlg.obj \
$(OBJS)\coredll_dragimgg.obj \
@@ -2822,6 +2841,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_checkbox.obj \
$(OBJS)\corelib_choice.obj \
$(OBJS)\corelib_colordlg.obj \
$(OBJS)\corelib_combo.obj \
$(OBJS)\corelib_combobox.obj \
$(OBJS)\corelib_control.obj \
$(OBJS)\corelib_dialog.obj \
@@ -2871,6 +2891,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_choiccmn.obj \
$(OBJS)\corelib_clipcmn.obj \
$(OBJS)\corelib_colourcmn.obj \
$(OBJS)\corelib_combocmn.obj \
$(OBJS)\corelib_cmdproc.obj \
$(OBJS)\corelib_cmndata.obj \
$(OBJS)\corelib_containr.obj \
@@ -2941,6 +2962,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_busyinfo.obj \
$(OBJS)\corelib_choicdgg.obj \
$(OBJS)\corelib_choicbkg.obj \
$(OBJS)\corelib_combog.obj \
$(OBJS)\corelib_dcpsg.obj \
$(OBJS)\corelib_dirctrlg.obj \
$(OBJS)\corelib_dragimgg.obj \
@@ -3071,6 +3093,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_choiccmn.obj \
$(OBJS)\corelib_clipcmn.obj \
$(OBJS)\corelib_colourcmn.obj \
$(OBJS)\corelib_combocmn.obj \
$(OBJS)\corelib_cmdproc.obj \
$(OBJS)\corelib_cmndata.obj \
$(OBJS)\corelib_containr.obj \
@@ -3141,6 +3164,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_busyinfo.obj \
$(OBJS)\corelib_choicdgg.obj \
$(OBJS)\corelib_choicbkg.obj \
$(OBJS)\corelib_combog.obj \
$(OBJS)\corelib_dcpsg.obj \
$(OBJS)\corelib_dirctrlg.obj \
$(OBJS)\corelib_dragimgg.obj \
@@ -3185,6 +3209,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_gridsel.obj \
$(OBJS)\advdll_helpext.obj \
$(OBJS)\advdll_laywin.obj \
$(OBJS)\advdll_odcombo.obj \
$(OBJS)\advdll_propdlg.obj \
$(OBJS)\advdll_sashwin.obj \
$(OBJS)\advdll_splash.obj \
@@ -3213,6 +3238,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_gridsel.obj \
$(OBJS)\advdll_helpext.obj \
$(OBJS)\advdll_laywin.obj \
$(OBJS)\advdll_odcombo.obj \
$(OBJS)\advdll_propdlg.obj \
$(OBJS)\advdll_sashwin.obj \
$(OBJS)\advdll_splash.obj \
@@ -3250,6 +3276,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_gridsel.obj \
$(OBJS)\advlib_helpext.obj \
$(OBJS)\advlib_laywin.obj \
$(OBJS)\advlib_odcombo.obj \
$(OBJS)\advlib_propdlg.obj \
$(OBJS)\advlib_sashwin.obj \
$(OBJS)\advlib_splash.obj \
@@ -3278,6 +3305,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_gridsel.obj \
$(OBJS)\advlib_helpext.obj \
$(OBJS)\advlib_laywin.obj \
$(OBJS)\advlib_odcombo.obj \
$(OBJS)\advlib_propdlg.obj \
$(OBJS)\advlib_sashwin.obj \
$(OBJS)\advlib_splash.obj \
@@ -4643,6 +4671,9 @@ $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5558,6 +5589,11 @@ $(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5908,6 +5944,11 @@ $(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6063,6 +6104,11 @@ $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6409,6 +6455,9 @@ $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7324,6 +7373,11 @@ $(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7674,6 +7728,11 @@ $(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7829,6 +7888,11 @@ $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8487,6 +8551,9 @@ $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
$(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9159,6 +9226,11 @@ $(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9509,6 +9581,11 @@ $(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9641,6 +9718,9 @@ $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
$(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10313,6 +10393,11 @@ $(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10663,6 +10748,11 @@ $(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10807,6 +10897,9 @@ $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
$(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
$(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
@@ -10885,6 +10978,9 @@ $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
$(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
$(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**

96
build/msw/makefile.wat
View File

@@ -239,6 +239,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_checkbox.obj &
$(OBJS)\monodll_choice.obj &
$(OBJS)\monodll_colordlg.obj &
$(OBJS)\monodll_combo.obj &
$(OBJS)\monodll_combobox.obj &
$(OBJS)\monodll_control.obj &
$(OBJS)\monodll_dialog.obj &
@@ -288,6 +289,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_choiccmn.obj &
$(OBJS)\monodll_clipcmn.obj &
$(OBJS)\monodll_colourcmn.obj &
$(OBJS)\monodll_combocmn.obj &
$(OBJS)\monodll_cmdproc.obj &
$(OBJS)\monodll_cmndata.obj &
$(OBJS)\monodll_containr.obj &
@@ -358,6 +360,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_busyinfo.obj &
$(OBJS)\monodll_choicdgg.obj &
$(OBJS)\monodll_choicbkg.obj &
$(OBJS)\monodll_combog.obj &
$(OBJS)\monodll_dcpsg.obj &
$(OBJS)\monodll_dirctrlg.obj &
$(OBJS)\monodll_dragimgg.obj &
@@ -490,6 +493,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_choiccmn.obj &
$(OBJS)\monodll_clipcmn.obj &
$(OBJS)\monodll_colourcmn.obj &
$(OBJS)\monodll_combocmn.obj &
$(OBJS)\monodll_cmdproc.obj &
$(OBJS)\monodll_cmndata.obj &
$(OBJS)\monodll_containr.obj &
@@ -560,6 +564,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_busyinfo.obj &
$(OBJS)\monodll_choicdgg.obj &
$(OBJS)\monodll_choicbkg.obj &
$(OBJS)\monodll_combog.obj &
$(OBJS)\monodll_dcpsg.obj &
$(OBJS)\monodll_dirctrlg.obj &
$(OBJS)\monodll_dragimgg.obj &
@@ -596,6 +601,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_gridsel.obj &
$(OBJS)\monodll_helpext.obj &
$(OBJS)\monodll_laywin.obj &
$(OBJS)\monodll_odcombo.obj &
$(OBJS)\monodll_propdlg.obj &
$(OBJS)\monodll_sashwin.obj &
$(OBJS)\monodll_splash.obj &
@@ -624,6 +630,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_gridsel.obj &
$(OBJS)\monodll_helpext.obj &
$(OBJS)\monodll_laywin.obj &
$(OBJS)\monodll_odcombo.obj &
$(OBJS)\monodll_propdlg.obj &
$(OBJS)\monodll_sashwin.obj &
$(OBJS)\monodll_splash.obj &
@@ -790,6 +797,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_checkbox.obj &
$(OBJS)\monolib_choice.obj &
$(OBJS)\monolib_colordlg.obj &
$(OBJS)\monolib_combo.obj &
$(OBJS)\monolib_combobox.obj &
$(OBJS)\monolib_control.obj &
$(OBJS)\monolib_dialog.obj &
@@ -839,6 +847,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_choiccmn.obj &
$(OBJS)\monolib_clipcmn.obj &
$(OBJS)\monolib_colourcmn.obj &
$(OBJS)\monolib_combocmn.obj &
$(OBJS)\monolib_cmdproc.obj &
$(OBJS)\monolib_cmndata.obj &
$(OBJS)\monolib_containr.obj &
@@ -909,6 +918,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_busyinfo.obj &
$(OBJS)\monolib_choicdgg.obj &
$(OBJS)\monolib_choicbkg.obj &
$(OBJS)\monolib_combog.obj &
$(OBJS)\monolib_dcpsg.obj &
$(OBJS)\monolib_dirctrlg.obj &
$(OBJS)\monolib_dragimgg.obj &
@@ -1041,6 +1051,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_choiccmn.obj &
$(OBJS)\monolib_clipcmn.obj &
$(OBJS)\monolib_colourcmn.obj &
$(OBJS)\monolib_combocmn.obj &
$(OBJS)\monolib_cmdproc.obj &
$(OBJS)\monolib_cmndata.obj &
$(OBJS)\monolib_containr.obj &
@@ -1111,6 +1122,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_busyinfo.obj &
$(OBJS)\monolib_choicdgg.obj &
$(OBJS)\monolib_choicbkg.obj &
$(OBJS)\monolib_combog.obj &
$(OBJS)\monolib_dcpsg.obj &
$(OBJS)\monolib_dirctrlg.obj &
$(OBJS)\monolib_dragimgg.obj &
@@ -1147,6 +1159,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_gridsel.obj &
$(OBJS)\monolib_helpext.obj &
$(OBJS)\monolib_laywin.obj &
$(OBJS)\monolib_odcombo.obj &
$(OBJS)\monolib_propdlg.obj &
$(OBJS)\monolib_sashwin.obj &
$(OBJS)\monolib_splash.obj &
@@ -1175,6 +1188,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_gridsel.obj &
$(OBJS)\monolib_helpext.obj &
$(OBJS)\monolib_laywin.obj &
$(OBJS)\monolib_odcombo.obj &
$(OBJS)\monolib_propdlg.obj &
$(OBJS)\monolib_sashwin.obj &
$(OBJS)\monolib_splash.obj &
@@ -1287,6 +1301,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_checkbox.obj &
$(OBJS)\coredll_choice.obj &
$(OBJS)\coredll_colordlg.obj &
$(OBJS)\coredll_combo.obj &
$(OBJS)\coredll_combobox.obj &
$(OBJS)\coredll_control.obj &
$(OBJS)\coredll_dialog.obj &
@@ -1336,6 +1351,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_choiccmn.obj &
$(OBJS)\coredll_clipcmn.obj &
$(OBJS)\coredll_colourcmn.obj &
$(OBJS)\coredll_combocmn.obj &
$(OBJS)\coredll_cmdproc.obj &
$(OBJS)\coredll_cmndata.obj &
$(OBJS)\coredll_containr.obj &
@@ -1406,6 +1422,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_busyinfo.obj &
$(OBJS)\coredll_choicdgg.obj &
$(OBJS)\coredll_choicbkg.obj &
$(OBJS)\coredll_combog.obj &
$(OBJS)\coredll_dcpsg.obj &
$(OBJS)\coredll_dirctrlg.obj &
$(OBJS)\coredll_dragimgg.obj &
@@ -1538,6 +1555,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_choiccmn.obj &
$(OBJS)\coredll_clipcmn.obj &
$(OBJS)\coredll_colourcmn.obj &
$(OBJS)\coredll_combocmn.obj &
$(OBJS)\coredll_cmdproc.obj &
$(OBJS)\coredll_cmndata.obj &
$(OBJS)\coredll_containr.obj &
@@ -1608,6 +1626,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_busyinfo.obj &
$(OBJS)\coredll_choicdgg.obj &
$(OBJS)\coredll_choicbkg.obj &
$(OBJS)\coredll_combog.obj &
$(OBJS)\coredll_dcpsg.obj &
$(OBJS)\coredll_dirctrlg.obj &
$(OBJS)\coredll_dragimgg.obj &
@@ -1700,6 +1719,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_checkbox.obj &
$(OBJS)\corelib_choice.obj &
$(OBJS)\corelib_colordlg.obj &
$(OBJS)\corelib_combo.obj &
$(OBJS)\corelib_combobox.obj &
$(OBJS)\corelib_control.obj &
$(OBJS)\corelib_dialog.obj &
@@ -1749,6 +1769,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_choiccmn.obj &
$(OBJS)\corelib_clipcmn.obj &
$(OBJS)\corelib_colourcmn.obj &
$(OBJS)\corelib_combocmn.obj &
$(OBJS)\corelib_cmdproc.obj &
$(OBJS)\corelib_cmndata.obj &
$(OBJS)\corelib_containr.obj &
@@ -1819,6 +1840,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_busyinfo.obj &
$(OBJS)\corelib_choicdgg.obj &
$(OBJS)\corelib_choicbkg.obj &
$(OBJS)\corelib_combog.obj &
$(OBJS)\corelib_dcpsg.obj &
$(OBJS)\corelib_dirctrlg.obj &
$(OBJS)\corelib_dragimgg.obj &
@@ -1951,6 +1973,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_choiccmn.obj &
$(OBJS)\corelib_clipcmn.obj &
$(OBJS)\corelib_colourcmn.obj &
$(OBJS)\corelib_combocmn.obj &
$(OBJS)\corelib_cmdproc.obj &
$(OBJS)\corelib_cmndata.obj &
$(OBJS)\corelib_containr.obj &
@@ -2021,6 +2044,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_busyinfo.obj &
$(OBJS)\corelib_choicdgg.obj &
$(OBJS)\corelib_choicbkg.obj &
$(OBJS)\corelib_combog.obj &
$(OBJS)\corelib_dcpsg.obj &
$(OBJS)\corelib_dirctrlg.obj &
$(OBJS)\corelib_dragimgg.obj &
@@ -2066,6 +2090,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_gridsel.obj &
$(OBJS)\advdll_helpext.obj &
$(OBJS)\advdll_laywin.obj &
$(OBJS)\advdll_odcombo.obj &
$(OBJS)\advdll_propdlg.obj &
$(OBJS)\advdll_sashwin.obj &
$(OBJS)\advdll_splash.obj &
@@ -2094,6 +2119,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_gridsel.obj &
$(OBJS)\advdll_helpext.obj &
$(OBJS)\advdll_laywin.obj &
$(OBJS)\advdll_odcombo.obj &
$(OBJS)\advdll_propdlg.obj &
$(OBJS)\advdll_sashwin.obj &
$(OBJS)\advdll_splash.obj &
@@ -2131,6 +2157,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_gridsel.obj &
$(OBJS)\advlib_helpext.obj &
$(OBJS)\advlib_laywin.obj &
$(OBJS)\advlib_odcombo.obj &
$(OBJS)\advlib_propdlg.obj &
$(OBJS)\advlib_sashwin.obj &
$(OBJS)\advlib_splash.obj &
@@ -2159,6 +2186,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_gridsel.obj &
$(OBJS)\advlib_helpext.obj &
$(OBJS)\advlib_laywin.obj &
$(OBJS)\advlib_odcombo.obj &
$(OBJS)\advlib_propdlg.obj &
$(OBJS)\advlib_sashwin.obj &
$(OBJS)\advlib_splash.obj &
@@ -4638,6 +4666,9 @@ $(OBJS)\monodll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp
$(OBJS)\monodll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_combo.obj : .AUTODEPEND ..\..\src\msw\combo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5653,6 +5684,11 @@ $(OBJS)\monodll_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6003,6 +6039,11 @@ $(OBJS)\monodll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6158,6 +6199,11 @@ $(OBJS)\monodll_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6504,6 +6550,9 @@ $(OBJS)\monolib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp
$(OBJS)\monolib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_combo.obj : .AUTODEPEND ..\..\src\msw\combo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7519,6 +7568,11 @@ $(OBJS)\monolib_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7869,6 +7923,11 @@ $(OBJS)\monolib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8024,6 +8083,11 @@ $(OBJS)\monolib_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8682,6 +8746,9 @@ $(OBJS)\coredll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp
$(OBJS)\coredll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_combo.obj : .AUTODEPEND ..\..\src\msw\combo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9454,6 +9521,11 @@ $(OBJS)\coredll_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9804,6 +9876,11 @@ $(OBJS)\coredll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9936,6 +10013,9 @@ $(OBJS)\corelib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp
$(OBJS)\corelib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_combo.obj : .AUTODEPEND ..\..\src\msw\combo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -10708,6 +10788,11 @@ $(OBJS)\corelib_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -11058,6 +11143,11 @@ $(OBJS)\corelib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -11202,6 +11292,9 @@ $(OBJS)\advdll_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp
$(OBJS)\advdll_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
@@ -11280,6 +11373,9 @@ $(OBJS)\advlib_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp
$(OBJS)\advlib_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<

8
build/msw/wx_adv.dsp
View File

@@ -648,6 +648,10 @@ SOURCE=..\..\src\generic\laywin.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\odcombo.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\propdlg.cpp
# End Source File
# Begin Source File
@@ -1205,6 +1209,10 @@ SOURCE=..\..\include\wx\laywin.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\odcombo.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\propdlg.h
# End Source File
# Begin Source File

4
build/msw/wx_base.dsp
View File

@@ -1319,6 +1319,10 @@ SOURCE=..\..\include\wx\msw\registry.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\seh.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\stackwalk.h
# End Source File
# Begin Source File

87
build/msw/wx_core.dsp
View File

@@ -496,6 +496,10 @@ SOURCE=..\..\src\common\colourcmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\combocmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\containr.cpp
# End Source File
# Begin Source File
@@ -1308,6 +1312,69 @@ SOURCE=..\..\src\msw\colour.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\combo.cpp
!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(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 Unicode Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
# PROP Exclude_From_Build 1
!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 Unicode Release"
!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
!ELSEIF "$(CFG)" == "core - Win32 Release"
!ELSEIF "$(CFG)" == "core - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\combobox.cpp
!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
@@ -4089,6 +4156,10 @@ SOURCE=..\..\src\generic\colrdlgg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\combog.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\dcpsg.cpp
# End Source File
# Begin Source File
@@ -7484,6 +7555,10 @@ SOURCE=..\..\include\wx\msw\colour.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\combo.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\combobox.h
# End Source File
# Begin Source File
@@ -7987,6 +8062,10 @@ SOURCE=..\..\include\wx\generic\colrdlgg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\combo.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\dataview.h
# End Source File
# Begin Source File
@@ -8439,6 +8518,10 @@ SOURCE=..\..\include\wx\colour.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\combo.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\combobox.h
# End Source File
# Begin Source File
@@ -8771,6 +8854,10 @@ SOURCE=..\..\include\wx\numdlg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\odcombo.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\ownerdrw.h
# End Source File
# Begin Source File

4
build/msw/wx_html.dsp
View File

@@ -1051,6 +1051,10 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\helpbest.h
# End Source File
# End Group
# Begin Group "wxHTML Headers"