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

added stock buttons support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-08-15 15:56:56 +00:00
parent c50e42a122
commit 401e3b6e5f
25 changed files with 943 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/bakefiles/files.bkl
View File

@@ -380,6 +380,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/artprov.cpp
src/common/artstd.cpp
src/common/bmpbase.cpp
src/common/buttoncmn.cpp
src/common/bookctrl.cpp
src/common/choiccmn.cpp
src/common/clipcmn.cpp
@@ -438,6 +439,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/settcmn.cpp
src/common/sizer.cpp
src/common/statbar.cpp
src/common/stockitem.cpp
src/common/tbarbase.cpp
src/common/textcmn.cpp
src/common/timercmn.cpp
@@ -545,6 +547,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/statbox.h
wx/stattext.h
wx/statusbr.h
wx/stockitem.h
wx/textctrl.h
wx/textdlg.h
wx/toolbar.h

61
build/msw/makefile.bcc
View File

@@ -36,8 +36,9 @@ OBJS = \
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXREGEX_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) -tWM -I..\..\include -I$(SETUPHDIR) $(__UNICODE_DEFINE_p) \
-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070 $(CPPFLAGS) $(CFLAGS)
$(__OPTIMIZEFLAG) -tWM -I..\..\include -I$(SETUPHDIR) -D__WXMSW__ \
$(__UNICODE_DEFINE_p) -w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070 \
$(CPPFLAGS) $(CFLAGS)
WXREGEX_OBJECTS = \
$(OBJS)\wxregex_regcomp.obj \
$(OBJS)\wxregex_regexec.obj \
@@ -984,6 +985,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_artprov.obj \
$(OBJS)\monodll_artstd.obj \
$(OBJS)\monodll_bmpbase.obj \
$(OBJS)\monodll_buttoncmn.obj \
$(OBJS)\monodll_bookctrl.obj \
$(OBJS)\monodll_choiccmn.obj \
$(OBJS)\monodll_clipcmn.obj \
@@ -1042,6 +1044,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_settcmn.obj \
$(OBJS)\monodll_sizer.obj \
$(OBJS)\monodll_statbar.obj \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_timercmn.obj \
@@ -1177,6 +1180,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_artprov.obj \
$(OBJS)\monodll_artstd.obj \
$(OBJS)\monodll_bmpbase.obj \
$(OBJS)\monodll_buttoncmn.obj \
$(OBJS)\monodll_bookctrl.obj \
$(OBJS)\monodll_choiccmn.obj \
$(OBJS)\monodll_clipcmn.obj \
@@ -1235,6 +1239,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_settcmn.obj \
$(OBJS)\monodll_sizer.obj \
$(OBJS)\monodll_statbar.obj \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_timercmn.obj \
@@ -1417,6 +1422,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_artprov.obj \
$(OBJS)\monolib_artstd.obj \
$(OBJS)\monolib_bmpbase.obj \
$(OBJS)\monolib_buttoncmn.obj \
$(OBJS)\monolib_bookctrl.obj \
$(OBJS)\monolib_choiccmn.obj \
$(OBJS)\monolib_clipcmn.obj \
@@ -1475,6 +1481,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_settcmn.obj \
$(OBJS)\monolib_sizer.obj \
$(OBJS)\monolib_statbar.obj \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_timercmn.obj \
@@ -1610,6 +1617,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_artprov.obj \
$(OBJS)\monolib_artstd.obj \
$(OBJS)\monolib_bmpbase.obj \
$(OBJS)\monolib_buttoncmn.obj \
$(OBJS)\monolib_bookctrl.obj \
$(OBJS)\monolib_choiccmn.obj \
$(OBJS)\monolib_clipcmn.obj \
@@ -1668,6 +1676,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_settcmn.obj \
$(OBJS)\monolib_sizer.obj \
$(OBJS)\monolib_statbar.obj \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_timercmn.obj \
@@ -1823,6 +1832,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_artprov.obj \
$(OBJS)\coredll_artstd.obj \
$(OBJS)\coredll_bmpbase.obj \
$(OBJS)\coredll_buttoncmn.obj \
$(OBJS)\coredll_bookctrl.obj \
$(OBJS)\coredll_choiccmn.obj \
$(OBJS)\coredll_clipcmn.obj \
@@ -1881,6 +1891,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_settcmn.obj \
$(OBJS)\coredll_sizer.obj \
$(OBJS)\coredll_statbar.obj \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_timercmn.obj \
@@ -2016,6 +2027,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_artprov.obj \
$(OBJS)\coredll_artstd.obj \
$(OBJS)\coredll_bmpbase.obj \
$(OBJS)\coredll_buttoncmn.obj \
$(OBJS)\coredll_bookctrl.obj \
$(OBJS)\coredll_choiccmn.obj \
$(OBJS)\coredll_clipcmn.obj \
@@ -2074,6 +2086,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_settcmn.obj \
$(OBJS)\coredll_sizer.obj \
$(OBJS)\coredll_statbar.obj \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_timercmn.obj \
@@ -2213,6 +2226,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_artprov.obj \
$(OBJS)\corelib_artstd.obj \
$(OBJS)\corelib_bmpbase.obj \
$(OBJS)\corelib_buttoncmn.obj \
$(OBJS)\corelib_bookctrl.obj \
$(OBJS)\corelib_choiccmn.obj \
$(OBJS)\corelib_clipcmn.obj \
@@ -2271,6 +2285,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_settcmn.obj \
$(OBJS)\corelib_sizer.obj \
$(OBJS)\corelib_statbar.obj \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_timercmn.obj \
@@ -2406,6 +2421,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_artprov.obj \
$(OBJS)\corelib_artstd.obj \
$(OBJS)\corelib_bmpbase.obj \
$(OBJS)\corelib_buttoncmn.obj \
$(OBJS)\corelib_bookctrl.obj \
$(OBJS)\corelib_choiccmn.obj \
$(OBJS)\corelib_clipcmn.obj \
@@ -2464,6 +2480,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_settcmn.obj \
$(OBJS)\corelib_sizer.obj \
$(OBJS)\corelib_statbar.obj \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_timercmn.obj \
@@ -4349,6 +4366,11 @@ $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -4639,6 +4661,11 @@ $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5819,6 +5846,11 @@ $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -6109,6 +6141,11 @@ $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7445,6 +7482,11 @@ $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -7735,6 +7777,11 @@ $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -8567,6 +8614,11 @@ $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -8857,6 +8909,11 @@ $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**

59
build/msw/makefile.gcc
View File

@@ -27,7 +27,8 @@ OBJS = \
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
-I..\..\include -I$(SETUPHDIR) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
-I..\..\include -I$(SETUPHDIR) -D__WXMSW__ $(__UNICODE_DEFINE_p) $(CPPFLAGS) \
$(CFLAGS)
WXREGEX_OBJECTS = \
$(OBJS)\wxregex_regcomp.o \
$(OBJS)\wxregex_regexec.o \
@@ -974,6 +975,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_artprov.o \
$(OBJS)\monodll_artstd.o \
$(OBJS)\monodll_bmpbase.o \
$(OBJS)\monodll_buttoncmn.o \
$(OBJS)\monodll_bookctrl.o \
$(OBJS)\monodll_choiccmn.o \
$(OBJS)\monodll_clipcmn.o \
@@ -1032,6 +1034,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_settcmn.o \
$(OBJS)\monodll_sizer.o \
$(OBJS)\monodll_statbar.o \
$(OBJS)\monodll_stockitem.o \
$(OBJS)\monodll_tbarbase.o \
$(OBJS)\monodll_textcmn.o \
$(OBJS)\monodll_timercmn.o \
@@ -1169,6 +1172,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_artprov.o \
$(OBJS)\monodll_artstd.o \
$(OBJS)\monodll_bmpbase.o \
$(OBJS)\monodll_buttoncmn.o \
$(OBJS)\monodll_bookctrl.o \
$(OBJS)\monodll_choiccmn.o \
$(OBJS)\monodll_clipcmn.o \
@@ -1227,6 +1231,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_settcmn.o \
$(OBJS)\monodll_sizer.o \
$(OBJS)\monodll_statbar.o \
$(OBJS)\monodll_stockitem.o \
$(OBJS)\monodll_tbarbase.o \
$(OBJS)\monodll_textcmn.o \
$(OBJS)\monodll_timercmn.o \
@@ -1413,6 +1418,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_artprov.o \
$(OBJS)\monolib_artstd.o \
$(OBJS)\monolib_bmpbase.o \
$(OBJS)\monolib_buttoncmn.o \
$(OBJS)\monolib_bookctrl.o \
$(OBJS)\monolib_choiccmn.o \
$(OBJS)\monolib_clipcmn.o \
@@ -1471,6 +1477,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_settcmn.o \
$(OBJS)\monolib_sizer.o \
$(OBJS)\monolib_statbar.o \
$(OBJS)\monolib_stockitem.o \
$(OBJS)\monolib_tbarbase.o \
$(OBJS)\monolib_textcmn.o \
$(OBJS)\monolib_timercmn.o \
@@ -1608,6 +1615,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_artprov.o \
$(OBJS)\monolib_artstd.o \
$(OBJS)\monolib_bmpbase.o \
$(OBJS)\monolib_buttoncmn.o \
$(OBJS)\monolib_bookctrl.o \
$(OBJS)\monolib_choiccmn.o \
$(OBJS)\monolib_clipcmn.o \
@@ -1666,6 +1674,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_settcmn.o \
$(OBJS)\monolib_sizer.o \
$(OBJS)\monolib_statbar.o \
$(OBJS)\monolib_stockitem.o \
$(OBJS)\monolib_tbarbase.o \
$(OBJS)\monolib_textcmn.o \
$(OBJS)\monolib_timercmn.o \
@@ -1835,6 +1844,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_artprov.o \
$(OBJS)\coredll_artstd.o \
$(OBJS)\coredll_bmpbase.o \
$(OBJS)\coredll_buttoncmn.o \
$(OBJS)\coredll_bookctrl.o \
$(OBJS)\coredll_choiccmn.o \
$(OBJS)\coredll_clipcmn.o \
@@ -1893,6 +1903,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_settcmn.o \
$(OBJS)\coredll_sizer.o \
$(OBJS)\coredll_statbar.o \
$(OBJS)\coredll_stockitem.o \
$(OBJS)\coredll_tbarbase.o \
$(OBJS)\coredll_textcmn.o \
$(OBJS)\coredll_timercmn.o \
@@ -2030,6 +2041,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_artprov.o \
$(OBJS)\coredll_artstd.o \
$(OBJS)\coredll_bmpbase.o \
$(OBJS)\coredll_buttoncmn.o \
$(OBJS)\coredll_bookctrl.o \
$(OBJS)\coredll_choiccmn.o \
$(OBJS)\coredll_clipcmn.o \
@@ -2088,6 +2100,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_settcmn.o \
$(OBJS)\coredll_sizer.o \
$(OBJS)\coredll_statbar.o \
$(OBJS)\coredll_stockitem.o \
$(OBJS)\coredll_tbarbase.o \
$(OBJS)\coredll_textcmn.o \
$(OBJS)\coredll_timercmn.o \
@@ -2233,6 +2246,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_artprov.o \
$(OBJS)\corelib_artstd.o \
$(OBJS)\corelib_bmpbase.o \
$(OBJS)\corelib_buttoncmn.o \
$(OBJS)\corelib_bookctrl.o \
$(OBJS)\corelib_choiccmn.o \
$(OBJS)\corelib_clipcmn.o \
@@ -2291,6 +2305,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_settcmn.o \
$(OBJS)\corelib_sizer.o \
$(OBJS)\corelib_statbar.o \
$(OBJS)\corelib_stockitem.o \
$(OBJS)\corelib_tbarbase.o \
$(OBJS)\corelib_textcmn.o \
$(OBJS)\corelib_timercmn.o \
@@ -2428,6 +2443,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_artprov.o \
$(OBJS)\corelib_artstd.o \
$(OBJS)\corelib_bmpbase.o \
$(OBJS)\corelib_buttoncmn.o \
$(OBJS)\corelib_bookctrl.o \
$(OBJS)\corelib_choiccmn.o \
$(OBJS)\corelib_clipcmn.o \
@@ -2486,6 +2502,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_settcmn.o \
$(OBJS)\corelib_sizer.o \
$(OBJS)\corelib_statbar.o \
$(OBJS)\corelib_stockitem.o \
$(OBJS)\corelib_tbarbase.o \
$(OBJS)\corelib_textcmn.o \
$(OBJS)\corelib_timercmn.o \
@@ -4491,6 +4508,11 @@ $(OBJS)\monodll_bmpbase.o: ../../src/common/bmpbase.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_buttoncmn.o: ../../src/common/buttoncmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_bookctrl.o: ../../src/common/bookctrl.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -4781,6 +4803,11 @@ $(OBJS)\monodll_statbar.o: ../../src/common/statbar.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_stockitem.o: ../../src/common/stockitem.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_tbarbase.o: ../../src/common/tbarbase.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -6061,6 +6088,11 @@ $(OBJS)\monolib_bmpbase.o: ../../src/common/bmpbase.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_buttoncmn.o: ../../src/common/buttoncmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_bookctrl.o: ../../src/common/bookctrl.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -6351,6 +6383,11 @@ $(OBJS)\monolib_statbar.o: ../../src/common/statbar.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_stockitem.o: ../../src/common/stockitem.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_tbarbase.o: ../../src/common/tbarbase.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -7787,6 +7824,11 @@ $(OBJS)\coredll_bmpbase.o: ../../src/common/bmpbase.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_buttoncmn.o: ../../src/common/buttoncmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_bookctrl.o: ../../src/common/bookctrl.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -8077,6 +8119,11 @@ $(OBJS)\coredll_statbar.o: ../../src/common/statbar.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_stockitem.o: ../../src/common/stockitem.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_tbarbase.o: ../../src/common/tbarbase.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -9009,6 +9056,11 @@ $(OBJS)\corelib_bmpbase.o: ../../src/common/bmpbase.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_buttoncmn.o: ../../src/common/buttoncmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_bookctrl.o: ../../src/common/bookctrl.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -9299,6 +9351,11 @@ $(OBJS)\corelib_statbar.o: ../../src/common/statbar.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_stockitem.o: ../../src/common/stockitem.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_tbarbase.o: ../../src/common/tbarbase.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<

59
build/msw/makefile.vc
View File

@@ -29,7 +29,8 @@ SETUPHDIR = \
WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 $(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
/I..\..\include /I$(SETUPHDIR) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
/I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__UNICODE_DEFINE_p) $(CPPFLAGS) \
$(CFLAGS)
WXREGEX_OBJECTS = \
$(OBJS)\wxregex_regcomp.obj \
$(OBJS)\wxregex_regexec.obj \
@@ -1181,6 +1182,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_artprov.obj \
$(OBJS)\monodll_artstd.obj \
$(OBJS)\monodll_bmpbase.obj \
$(OBJS)\monodll_buttoncmn.obj \
$(OBJS)\monodll_bookctrl.obj \
$(OBJS)\monodll_choiccmn.obj \
$(OBJS)\monodll_clipcmn.obj \
@@ -1239,6 +1241,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_settcmn.obj \
$(OBJS)\monodll_sizer.obj \
$(OBJS)\monodll_statbar.obj \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_timercmn.obj \
@@ -1374,6 +1377,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_artprov.obj \
$(OBJS)\monodll_artstd.obj \
$(OBJS)\monodll_bmpbase.obj \
$(OBJS)\monodll_buttoncmn.obj \
$(OBJS)\monodll_bookctrl.obj \
$(OBJS)\monodll_choiccmn.obj \
$(OBJS)\monodll_clipcmn.obj \
@@ -1432,6 +1436,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_settcmn.obj \
$(OBJS)\monodll_sizer.obj \
$(OBJS)\monodll_statbar.obj \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_timercmn.obj \
@@ -1632,6 +1637,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_artprov.obj \
$(OBJS)\monolib_artstd.obj \
$(OBJS)\monolib_bmpbase.obj \
$(OBJS)\monolib_buttoncmn.obj \
$(OBJS)\monolib_bookctrl.obj \
$(OBJS)\monolib_choiccmn.obj \
$(OBJS)\monolib_clipcmn.obj \
@@ -1690,6 +1696,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_settcmn.obj \
$(OBJS)\monolib_sizer.obj \
$(OBJS)\monolib_statbar.obj \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_timercmn.obj \
@@ -1825,6 +1832,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_artprov.obj \
$(OBJS)\monolib_artstd.obj \
$(OBJS)\monolib_bmpbase.obj \
$(OBJS)\monolib_buttoncmn.obj \
$(OBJS)\monolib_bookctrl.obj \
$(OBJS)\monolib_choiccmn.obj \
$(OBJS)\monolib_clipcmn.obj \
@@ -1883,6 +1891,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_settcmn.obj \
$(OBJS)\monolib_sizer.obj \
$(OBJS)\monolib_statbar.obj \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_timercmn.obj \
@@ -2128,6 +2137,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_artprov.obj \
$(OBJS)\coredll_artstd.obj \
$(OBJS)\coredll_bmpbase.obj \
$(OBJS)\coredll_buttoncmn.obj \
$(OBJS)\coredll_bookctrl.obj \
$(OBJS)\coredll_choiccmn.obj \
$(OBJS)\coredll_clipcmn.obj \
@@ -2186,6 +2196,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_settcmn.obj \
$(OBJS)\coredll_sizer.obj \
$(OBJS)\coredll_statbar.obj \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_timercmn.obj \
@@ -2321,6 +2332,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_artprov.obj \
$(OBJS)\coredll_artstd.obj \
$(OBJS)\coredll_bmpbase.obj \
$(OBJS)\coredll_buttoncmn.obj \
$(OBJS)\coredll_bookctrl.obj \
$(OBJS)\coredll_choiccmn.obj \
$(OBJS)\coredll_clipcmn.obj \
@@ -2379,6 +2391,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_settcmn.obj \
$(OBJS)\coredll_sizer.obj \
$(OBJS)\coredll_statbar.obj \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_timercmn.obj \
@@ -2536,6 +2549,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_artprov.obj \
$(OBJS)\corelib_artstd.obj \
$(OBJS)\corelib_bmpbase.obj \
$(OBJS)\corelib_buttoncmn.obj \
$(OBJS)\corelib_bookctrl.obj \
$(OBJS)\corelib_choiccmn.obj \
$(OBJS)\corelib_clipcmn.obj \
@@ -2594,6 +2608,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_settcmn.obj \
$(OBJS)\corelib_sizer.obj \
$(OBJS)\corelib_statbar.obj \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_timercmn.obj \
@@ -2729,6 +2744,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_artprov.obj \
$(OBJS)\corelib_artstd.obj \
$(OBJS)\corelib_bmpbase.obj \
$(OBJS)\corelib_buttoncmn.obj \
$(OBJS)\corelib_bookctrl.obj \
$(OBJS)\corelib_choiccmn.obj \
$(OBJS)\corelib_clipcmn.obj \
@@ -2787,6 +2803,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_settcmn.obj \
$(OBJS)\corelib_sizer.obj \
$(OBJS)\corelib_statbar.obj \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_timercmn.obj \
@@ -4894,6 +4911,11 @@ $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5184,6 +5206,11 @@ $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6364,6 +6391,11 @@ $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6654,6 +6686,11 @@ $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7990,6 +8027,11 @@ $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -8280,6 +8322,11 @@ $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9112,6 +9159,11 @@ $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -9402,6 +9454,11 @@ $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**

59
build/msw/makefile.wat
View File

@@ -237,6 +237,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_artprov.obj &
$(OBJS)\monodll_artstd.obj &
$(OBJS)\monodll_bmpbase.obj &
$(OBJS)\monodll_buttoncmn.obj &
$(OBJS)\monodll_bookctrl.obj &
$(OBJS)\monodll_choiccmn.obj &
$(OBJS)\monodll_clipcmn.obj &
@@ -295,6 +296,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_settcmn.obj &
$(OBJS)\monodll_sizer.obj &
$(OBJS)\monodll_statbar.obj &
$(OBJS)\monodll_stockitem.obj &
$(OBJS)\monodll_tbarbase.obj &
$(OBJS)\monodll_textcmn.obj &
$(OBJS)\monodll_timercmn.obj &
@@ -432,6 +434,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_artprov.obj &
$(OBJS)\monodll_artstd.obj &
$(OBJS)\monodll_bmpbase.obj &
$(OBJS)\monodll_buttoncmn.obj &
$(OBJS)\monodll_bookctrl.obj &
$(OBJS)\monodll_choiccmn.obj &
$(OBJS)\monodll_clipcmn.obj &
@@ -490,6 +493,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_settcmn.obj &
$(OBJS)\monodll_sizer.obj &
$(OBJS)\monodll_statbar.obj &
$(OBJS)\monodll_stockitem.obj &
$(OBJS)\monodll_tbarbase.obj &
$(OBJS)\monodll_textcmn.obj &
$(OBJS)\monodll_timercmn.obj &
@@ -679,6 +683,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_artprov.obj &
$(OBJS)\monolib_artstd.obj &
$(OBJS)\monolib_bmpbase.obj &
$(OBJS)\monolib_buttoncmn.obj &
$(OBJS)\monolib_bookctrl.obj &
$(OBJS)\monolib_choiccmn.obj &
$(OBJS)\monolib_clipcmn.obj &
@@ -737,6 +742,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_settcmn.obj &
$(OBJS)\monolib_sizer.obj &
$(OBJS)\monolib_statbar.obj &
$(OBJS)\monolib_stockitem.obj &
$(OBJS)\monolib_tbarbase.obj &
$(OBJS)\monolib_textcmn.obj &
$(OBJS)\monolib_timercmn.obj &
@@ -874,6 +880,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_artprov.obj &
$(OBJS)\monolib_artstd.obj &
$(OBJS)\monolib_bmpbase.obj &
$(OBJS)\monolib_buttoncmn.obj &
$(OBJS)\monolib_bookctrl.obj &
$(OBJS)\monolib_choiccmn.obj &
$(OBJS)\monolib_clipcmn.obj &
@@ -932,6 +939,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_settcmn.obj &
$(OBJS)\monolib_sizer.obj &
$(OBJS)\monolib_statbar.obj &
$(OBJS)\monolib_stockitem.obj &
$(OBJS)\monolib_tbarbase.obj &
$(OBJS)\monolib_textcmn.obj &
$(OBJS)\monolib_timercmn.obj &
@@ -1107,6 +1115,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_artprov.obj &
$(OBJS)\coredll_artstd.obj &
$(OBJS)\coredll_bmpbase.obj &
$(OBJS)\coredll_buttoncmn.obj &
$(OBJS)\coredll_bookctrl.obj &
$(OBJS)\coredll_choiccmn.obj &
$(OBJS)\coredll_clipcmn.obj &
@@ -1165,6 +1174,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_settcmn.obj &
$(OBJS)\coredll_sizer.obj &
$(OBJS)\coredll_statbar.obj &
$(OBJS)\coredll_stockitem.obj &
$(OBJS)\coredll_tbarbase.obj &
$(OBJS)\coredll_textcmn.obj &
$(OBJS)\coredll_timercmn.obj &
@@ -1302,6 +1312,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_artprov.obj &
$(OBJS)\coredll_artstd.obj &
$(OBJS)\coredll_bmpbase.obj &
$(OBJS)\coredll_buttoncmn.obj &
$(OBJS)\coredll_bookctrl.obj &
$(OBJS)\coredll_choiccmn.obj &
$(OBJS)\coredll_clipcmn.obj &
@@ -1360,6 +1371,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_settcmn.obj &
$(OBJS)\coredll_sizer.obj &
$(OBJS)\coredll_statbar.obj &
$(OBJS)\coredll_stockitem.obj &
$(OBJS)\coredll_tbarbase.obj &
$(OBJS)\coredll_textcmn.obj &
$(OBJS)\coredll_timercmn.obj &
@@ -1507,6 +1519,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_artprov.obj &
$(OBJS)\corelib_artstd.obj &
$(OBJS)\corelib_bmpbase.obj &
$(OBJS)\corelib_buttoncmn.obj &
$(OBJS)\corelib_bookctrl.obj &
$(OBJS)\corelib_choiccmn.obj &
$(OBJS)\corelib_clipcmn.obj &
@@ -1565,6 +1578,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_settcmn.obj &
$(OBJS)\corelib_sizer.obj &
$(OBJS)\corelib_statbar.obj &
$(OBJS)\corelib_stockitem.obj &
$(OBJS)\corelib_tbarbase.obj &
$(OBJS)\corelib_textcmn.obj &
$(OBJS)\corelib_timercmn.obj &
@@ -1702,6 +1716,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_artprov.obj &
$(OBJS)\corelib_artstd.obj &
$(OBJS)\corelib_bmpbase.obj &
$(OBJS)\corelib_buttoncmn.obj &
$(OBJS)\corelib_bookctrl.obj &
$(OBJS)\corelib_choiccmn.obj &
$(OBJS)\corelib_clipcmn.obj &
@@ -1760,6 +1775,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_settcmn.obj &
$(OBJS)\corelib_sizer.obj &
$(OBJS)\corelib_statbar.obj &
$(OBJS)\corelib_stockitem.obj &
$(OBJS)\corelib_tbarbase.obj &
$(OBJS)\corelib_textcmn.obj &
$(OBJS)\corelib_timercmn.obj &
@@ -2030,7 +2046,8 @@ OBJS = &
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
-i=..\..\include -i=$(SETUPHDIR) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
-i=..\..\include -i=$(SETUPHDIR) -d__WXMSW__ $(__UNICODE_DEFINE_p) &
$(CPPFLAGS) $(CFLAGS)
WXREGEX_OBJECTS = &
$(OBJS)\wxregex_regcomp.obj &
$(OBJS)\wxregex_regexec.obj &
@@ -4679,6 +4696,11 @@ $(OBJS)\monodll_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_buttoncmn.obj : .AUTODEPEND ..\..\src\common\buttoncmn.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -4969,6 +4991,11 @@ $(OBJS)\monodll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6249,6 +6276,11 @@ $(OBJS)\monolib_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_buttoncmn.obj : .AUTODEPEND ..\..\src\common\buttoncmn.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -6539,6 +6571,11 @@ $(OBJS)\monolib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7975,6 +8012,11 @@ $(OBJS)\coredll_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_buttoncmn.obj : .AUTODEPEND ..\..\src\common\buttoncmn.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -8265,6 +8307,11 @@ $(OBJS)\coredll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9197,6 +9244,11 @@ $(OBJS)\corelib_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_buttoncmn.obj : .AUTODEPEND ..\..\src\common\buttoncmn.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -9487,6 +9539,11 @@ $(OBJS)\corelib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

12
build/msw/wx_core.dsp
View File

@@ -476,6 +476,10 @@ SOURCE=..\..\src\common\bookctrl.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\buttoncmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\choiccmn.cpp
# End Source File
# Begin Source File
@@ -716,6 +720,10 @@ SOURCE=..\..\src\common\statbar.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\stockitem.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\tbarbase.cpp
# End Source File
# Begin Source File
@@ -8578,6 +8586,10 @@ SOURCE=..\..\include\wx\statusbr.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\stockitem.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\tab.h
# End Source File
# Begin Source File