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

rebaked after listctrl/imagelist and wxUniv changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-18 23:26:55 +00:00
parent 147b8a4ab5
commit 8930b2ed1e
6 changed files with 480 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
build/msw/makefile.bcc
View File

@@ -1271,6 +1271,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gdiobj.obj \
$(OBJS)\monodll_gsockmsw.obj \
$(OBJS)\monodll_icon.obj \
$(OBJS)\monodll_imaglist.obj \
$(OBJS)\monodll_minifram.obj \
$(OBJS)\monodll_dataobj.obj \
$(OBJS)\monodll_dropsrc.obj \
@@ -1311,7 +1312,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_filedlg.obj \
$(OBJS)\monodll_frame.obj \
$(OBJS)\monodll_gauge95.obj \
$(OBJS)\monodll_imaglist.obj \
$(OBJS)\monodll_iniconf.obj \
$(OBJS)\monodll_listbox.obj \
$(OBJS)\monodll_listctrl.obj \
@@ -1483,6 +1483,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gdiobj.obj \
$(OBJS)\monodll_gsockmsw.obj \
$(OBJS)\monodll_icon.obj \
$(OBJS)\monodll_imaglist.obj \
$(OBJS)\monodll_minifram.obj \
$(OBJS)\monodll_dataobj.obj \
$(OBJS)\monodll_dropsrc.obj \
@@ -1547,6 +1548,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_statline.obj \
$(OBJS)\monodll_stattext.obj \
$(OBJS)\monodll_statusbr.obj \
$(OBJS)\monodll_stdrend.obj \
$(OBJS)\monodll_textctrl.obj \
$(OBJS)\monodll_tglbtn.obj \
$(OBJS)\monodll_theme.obj \
@@ -1846,6 +1848,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gdiobj.obj \
$(OBJS)\monolib_gsockmsw.obj \
$(OBJS)\monolib_icon.obj \
$(OBJS)\monolib_imaglist.obj \
$(OBJS)\monolib_minifram.obj \
$(OBJS)\monolib_dataobj.obj \
$(OBJS)\monolib_dropsrc.obj \
@@ -1886,7 +1889,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_filedlg.obj \
$(OBJS)\monolib_frame.obj \
$(OBJS)\monolib_gauge95.obj \
$(OBJS)\monolib_imaglist.obj \
$(OBJS)\monolib_iniconf.obj \
$(OBJS)\monolib_listbox.obj \
$(OBJS)\monolib_listctrl.obj \
@@ -2058,6 +2060,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gdiobj.obj \
$(OBJS)\monolib_gsockmsw.obj \
$(OBJS)\monolib_icon.obj \
$(OBJS)\monolib_imaglist.obj \
$(OBJS)\monolib_minifram.obj \
$(OBJS)\monolib_dataobj.obj \
$(OBJS)\monolib_dropsrc.obj \
@@ -2122,6 +2125,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_statline.obj \
$(OBJS)\monolib_stattext.obj \
$(OBJS)\monolib_statusbr.obj \
$(OBJS)\monolib_stdrend.obj \
$(OBJS)\monolib_textctrl.obj \
$(OBJS)\monolib_tglbtn.obj \
$(OBJS)\monolib_theme.obj \
@@ -2338,6 +2342,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_gdiobj.obj \
$(OBJS)\coredll_gsockmsw.obj \
$(OBJS)\coredll_icon.obj \
$(OBJS)\coredll_imaglist.obj \
$(OBJS)\coredll_minifram.obj \
$(OBJS)\coredll_dataobj.obj \
$(OBJS)\coredll_dropsrc.obj \
@@ -2378,7 +2383,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_filedlg.obj \
$(OBJS)\coredll_frame.obj \
$(OBJS)\coredll_gauge95.obj \
$(OBJS)\coredll_imaglist.obj \
$(OBJS)\coredll_iniconf.obj \
$(OBJS)\coredll_listbox.obj \
$(OBJS)\coredll_listctrl.obj \
@@ -2550,6 +2554,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_gdiobj.obj \
$(OBJS)\coredll_gsockmsw.obj \
$(OBJS)\coredll_icon.obj \
$(OBJS)\coredll_imaglist.obj \
$(OBJS)\coredll_minifram.obj \
$(OBJS)\coredll_dataobj.obj \
$(OBJS)\coredll_dropsrc.obj \
@@ -2614,6 +2619,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_statline.obj \
$(OBJS)\coredll_stattext.obj \
$(OBJS)\coredll_statusbr.obj \
$(OBJS)\coredll_stdrend.obj \
$(OBJS)\coredll_textctrl.obj \
$(OBJS)\coredll_tglbtn.obj \
$(OBJS)\coredll_theme.obj \
@@ -2767,6 +2773,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_gdiobj.obj \
$(OBJS)\corelib_gsockmsw.obj \
$(OBJS)\corelib_icon.obj \
$(OBJS)\corelib_imaglist.obj \
$(OBJS)\corelib_minifram.obj \
$(OBJS)\corelib_dataobj.obj \
$(OBJS)\corelib_dropsrc.obj \
@@ -2807,7 +2814,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_filedlg.obj \
$(OBJS)\corelib_frame.obj \
$(OBJS)\corelib_gauge95.obj \
$(OBJS)\corelib_imaglist.obj \
$(OBJS)\corelib_iniconf.obj \
$(OBJS)\corelib_listbox.obj \
$(OBJS)\corelib_listctrl.obj \
@@ -2979,6 +2985,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_gdiobj.obj \
$(OBJS)\corelib_gsockmsw.obj \
$(OBJS)\corelib_icon.obj \
$(OBJS)\corelib_imaglist.obj \
$(OBJS)\corelib_minifram.obj \
$(OBJS)\corelib_dataobj.obj \
$(OBJS)\corelib_dropsrc.obj \
@@ -3043,6 +3050,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_statline.obj \
$(OBJS)\corelib_stattext.obj \
$(OBJS)\corelib_statusbr.obj \
$(OBJS)\corelib_stdrend.obj \
$(OBJS)\corelib_textctrl.obj \
$(OBJS)\corelib_tglbtn.obj \
$(OBJS)\corelib_theme.obj \
@@ -4705,6 +4713,9 @@ $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5142,6 +5153,16 @@ $(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\monodll_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5352,16 +5373,6 @@ $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\monodll_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6578,6 +6589,9 @@ $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7015,6 +7029,16 @@ $(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\monolib_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7225,16 +7249,6 @@ $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\monolib_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8772,6 +8786,9 @@ $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -8918,6 +8935,16 @@ $(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\coredll_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9128,16 +9155,6 @@ $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\coredll_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9996,6 +10013,9 @@ $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10142,6 +10162,16 @@ $(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\corelib_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10352,16 +10382,6 @@ $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\corelib_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**