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

Merge in from trunk r68684 - r69046

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@69047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-09-10 15:09:22 +00:00
parent d4adec8361 01bd848eb9
commit 1d156af324
283 changed files with 12986 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/bakefiles/files.bkl
View File

@@ -879,6 +879,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/helphtml.h
wx/icon.h
wx/infobar.h
wx/itemid.h
wx/layout.h
wx/listbox.h
wx/mdi.h
@@ -920,6 +921,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/valnum.h
wx/window.h
wx/windowid.h
wx/withimages.h
wx/wrapsizer.h
wx/wupdlock.h
@@ -996,6 +998,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/paper.h
wx/persist.h
wx/persist/bookctrl.h
wx/persist/splitter.h
wx/persist/toplevel.h
wx/persist/treebook.h
wx/persist/window.h
@@ -2895,6 +2898,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/listctrl.h
wx/generic/mdig.h
wx/generic/statusbr.h
wx/univ/anybutton.h
wx/univ/app.h
wx/univ/bmpbuttn.h
wx/univ/button.h
@@ -2951,6 +2955,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/hyperlnkcmn.cpp
src/common/odcombocmn.cpp
src/generic/aboutdlgg.cpp
src/generic/bannerwindow.cpp
src/generic/bmpcboxg.cpp
src/generic/calctrlg.cpp
src/generic/commandlinkbuttong.cpp
@@ -2970,12 +2975,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/sashwin.cpp
src/generic/splash.cpp
src/generic/tipdlg.cpp
src/generic/treelist.cpp
src/generic/wizard.cpp
</set>
<set var="ADVANCED_CMN_HDR" hints="files">
wx/aboutdlg.h
wx/animate.h
wx/bannerwindow.h
wx/bmpcbox.h
wx/calctrl.h
wx/commandlinkbutton.h
@@ -3016,6 +3023,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/splash.h
wx/taskbar.h
wx/tipdlg.h
wx/treelist.h
wx/wizard.h
</set>
@@ -3386,6 +3394,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="XRC_SRC" hints="files">
src/xrc/xh_animatctrl.cpp
src/xrc/xh_bannerwindow.cpp
src/xrc/xh_bmp.cpp
src/xrc/xh_bmpcbox.cpp
src/xrc/xh_bmpbt.cpp
@@ -3454,6 +3463,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="XRC_HDR" hints="files">
wx/xrc/xh_all.h
wx/xrc/xh_animatctrl.h
wx/xrc/xh_bannerwindow.h
wx/xrc/xh_bmpbt.h
wx/xrc/xh_bmp.h
wx/xrc/xh_bmpcbox.h

64
build/msw/makefile.bcc
View File

@@ -1165,6 +1165,7 @@ XRCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_dummy.obj \
$(OBJS)\xrcdll_xh_animatctrl.obj \
$(OBJS)\xrcdll_xh_bannerwindow.obj \
$(OBJS)\xrcdll_xh_bmp.obj \
$(OBJS)\xrcdll_xh_bmpcbox.obj \
$(OBJS)\xrcdll_xh_bmpbt.obj \
@@ -1239,6 +1240,7 @@ XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
XRCLIB_OBJECTS = \
$(OBJS)\xrclib_dummy.obj \
$(OBJS)\xrclib_xh_animatctrl.obj \
$(OBJS)\xrclib_xh_bannerwindow.obj \
$(OBJS)\xrclib_xh_bmp.obj \
$(OBJS)\xrclib_xh_bmpcbox.obj \
$(OBJS)\xrclib_xh_bmpbt.obj \
@@ -1610,6 +1612,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_debugrpt.obj \
$(OBJS)\monodll_dbgrptg.obj \
$(OBJS)\monodll_xh_animatctrl.obj \
$(OBJS)\monodll_xh_bannerwindow.obj \
$(OBJS)\monodll_xh_bmp.obj \
$(OBJS)\monodll_xh_bmpcbox.obj \
$(OBJS)\monodll_xh_bmpbt.obj \
@@ -2258,6 +2261,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_hyperlnkcmn.obj \
$(OBJS)\monodll_odcombocmn.obj \
$(OBJS)\monodll_aboutdlgg.obj \
$(OBJS)\monodll_bannerwindow.obj \
$(OBJS)\monodll_bmpcboxg.obj \
$(OBJS)\monodll_calctrlg.obj \
$(OBJS)\monodll_commandlinkbuttong.obj \
@@ -2277,6 +2281,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_sashwin.obj \
$(OBJS)\monodll_splash.obj \
$(OBJS)\monodll_tipdlg.obj \
$(OBJS)\monodll_treelist.obj \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_aboutdlg.obj \
@@ -2302,6 +2307,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_hyperlnkcmn.obj \
$(OBJS)\monodll_odcombocmn.obj \
$(OBJS)\monodll_aboutdlgg.obj \
$(OBJS)\monodll_bannerwindow.obj \
$(OBJS)\monodll_bmpcboxg.obj \
$(OBJS)\monodll_calctrlg.obj \
$(OBJS)\monodll_commandlinkbuttong.obj \
@@ -2321,6 +2327,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_sashwin.obj \
$(OBJS)\monodll_splash.obj \
$(OBJS)\monodll_tipdlg.obj \
$(OBJS)\monodll_treelist.obj \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_aboutdlg.obj \
@@ -2377,6 +2384,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_debugrpt.obj \
$(OBJS)\monolib_dbgrptg.obj \
$(OBJS)\monolib_xh_animatctrl.obj \
$(OBJS)\monolib_xh_bannerwindow.obj \
$(OBJS)\monolib_xh_bmp.obj \
$(OBJS)\monolib_xh_bmpcbox.obj \
$(OBJS)\monolib_xh_bmpbt.obj \
@@ -3025,6 +3033,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_hyperlnkcmn.obj \
$(OBJS)\monolib_odcombocmn.obj \
$(OBJS)\monolib_aboutdlgg.obj \
$(OBJS)\monolib_bannerwindow.obj \
$(OBJS)\monolib_bmpcboxg.obj \
$(OBJS)\monolib_calctrlg.obj \
$(OBJS)\monolib_commandlinkbuttong.obj \
@@ -3044,6 +3053,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_sashwin.obj \
$(OBJS)\monolib_splash.obj \
$(OBJS)\monolib_tipdlg.obj \
$(OBJS)\monolib_treelist.obj \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_aboutdlg.obj \
@@ -3069,6 +3079,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_hyperlnkcmn.obj \
$(OBJS)\monolib_odcombocmn.obj \
$(OBJS)\monolib_aboutdlgg.obj \
$(OBJS)\monolib_bannerwindow.obj \
$(OBJS)\monolib_bmpcboxg.obj \
$(OBJS)\monolib_calctrlg.obj \
$(OBJS)\monolib_commandlinkbuttong.obj \
@@ -3088,6 +3099,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_sashwin.obj \
$(OBJS)\monolib_splash.obj \
$(OBJS)\monolib_tipdlg.obj \
$(OBJS)\monolib_treelist.obj \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_aboutdlg.obj \
@@ -4229,6 +4241,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_hyperlnkcmn.obj \
$(OBJS)\advdll_odcombocmn.obj \
$(OBJS)\advdll_aboutdlgg.obj \
$(OBJS)\advdll_bannerwindow.obj \
$(OBJS)\advdll_bmpcboxg.obj \
$(OBJS)\advdll_calctrlg.obj \
$(OBJS)\advdll_commandlinkbuttong.obj \
@@ -4248,6 +4261,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_sashwin.obj \
$(OBJS)\advdll_splash.obj \
$(OBJS)\advdll_tipdlg.obj \
$(OBJS)\advdll_treelist.obj \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_aboutdlg.obj \
@@ -4273,6 +4287,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_hyperlnkcmn.obj \
$(OBJS)\advdll_odcombocmn.obj \
$(OBJS)\advdll_aboutdlgg.obj \
$(OBJS)\advdll_bannerwindow.obj \
$(OBJS)\advdll_bmpcboxg.obj \
$(OBJS)\advdll_calctrlg.obj \
$(OBJS)\advdll_commandlinkbuttong.obj \
@@ -4292,6 +4307,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_sashwin.obj \
$(OBJS)\advdll_splash.obj \
$(OBJS)\advdll_tipdlg.obj \
$(OBJS)\advdll_treelist.obj \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_aboutdlg.obj \
@@ -4315,6 +4331,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_hyperlnkcmn.obj \
$(OBJS)\advlib_odcombocmn.obj \
$(OBJS)\advlib_aboutdlgg.obj \
$(OBJS)\advlib_bannerwindow.obj \
$(OBJS)\advlib_bmpcboxg.obj \
$(OBJS)\advlib_calctrlg.obj \
$(OBJS)\advlib_commandlinkbuttong.obj \
@@ -4334,6 +4351,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_sashwin.obj \
$(OBJS)\advlib_splash.obj \
$(OBJS)\advlib_tipdlg.obj \
$(OBJS)\advlib_treelist.obj \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_aboutdlg.obj \
@@ -4359,6 +4377,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_hyperlnkcmn.obj \
$(OBJS)\advlib_odcombocmn.obj \
$(OBJS)\advlib_aboutdlgg.obj \
$(OBJS)\advlib_bannerwindow.obj \
$(OBJS)\advlib_bmpcboxg.obj \
$(OBJS)\advlib_calctrlg.obj \
$(OBJS)\advlib_commandlinkbuttong.obj \
@@ -4378,6 +4397,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_sashwin.obj \
$(OBJS)\advlib_splash.obj \
$(OBJS)\advlib_tipdlg.obj \
$(OBJS)\advlib_treelist.obj \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_aboutdlg.obj \
@@ -6785,6 +6805,9 @@ $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
$(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
$(OBJS)\monodll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp
$(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
@@ -8203,6 +8226,11 @@ $(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
@@ -8298,6 +8326,11 @@ $(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\wizard.cpp
@@ -9145,6 +9178,9 @@ $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
$(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
$(OBJS)\monolib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp
$(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
@@ -10563,6 +10599,11 @@ $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
@@ -10658,6 +10699,11 @@ $(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp
@@ -14321,6 +14367,9 @@ $(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
$(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
@@ -14378,6 +14427,9 @@ $(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
$(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp
@@ -14447,6 +14499,9 @@ $(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
$(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
@@ -14504,6 +14559,9 @@ $(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
$(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp
@@ -14804,6 +14862,9 @@ $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
$(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
$(OBJS)\xrcdll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp
$(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
@@ -14996,6 +15057,9 @@ $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
$(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
$(OBJS)\xrclib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp
$(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp

64
build/msw/makefile.gcc
View File

@@ -1164,6 +1164,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_dummy.o \
$(OBJS)\xrcdll_version_rc.o \
$(OBJS)\xrcdll_xh_animatctrl.o \
$(OBJS)\xrcdll_xh_bannerwindow.o \
$(OBJS)\xrcdll_xh_bmp.o \
$(OBJS)\xrcdll_xh_bmpcbox.o \
$(OBJS)\xrcdll_xh_bmpbt.o \
@@ -1237,6 +1238,7 @@ XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS)
XRCLIB_OBJECTS = \
$(OBJS)\xrclib_dummy.o \
$(OBJS)\xrclib_xh_animatctrl.o \
$(OBJS)\xrclib_xh_bannerwindow.o \
$(OBJS)\xrclib_xh_bmp.o \
$(OBJS)\xrclib_xh_bmpcbox.o \
$(OBJS)\xrclib_xh_bmpbt.o \
@@ -1621,6 +1623,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_debugrpt.o \
$(OBJS)\monodll_dbgrptg.o \
$(OBJS)\monodll_xh_animatctrl.o \
$(OBJS)\monodll_xh_bannerwindow.o \
$(OBJS)\monodll_xh_bmp.o \
$(OBJS)\monodll_xh_bmpcbox.o \
$(OBJS)\monodll_xh_bmpbt.o \
@@ -2273,6 +2276,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_hyperlnkcmn.o \
$(OBJS)\monodll_odcombocmn.o \
$(OBJS)\monodll_aboutdlgg.o \
$(OBJS)\monodll_bannerwindow.o \
$(OBJS)\monodll_bmpcboxg.o \
$(OBJS)\monodll_calctrlg.o \
$(OBJS)\monodll_commandlinkbuttong.o \
@@ -2292,6 +2296,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_sashwin.o \
$(OBJS)\monodll_splash.o \
$(OBJS)\monodll_tipdlg.o \
$(OBJS)\monodll_treelist.o \
$(OBJS)\monodll_wizard.o \
$(OBJS)\monodll_taskbarcmn.o \
$(OBJS)\monodll_aboutdlg.o \
@@ -2317,6 +2322,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_hyperlnkcmn.o \
$(OBJS)\monodll_odcombocmn.o \
$(OBJS)\monodll_aboutdlgg.o \
$(OBJS)\monodll_bannerwindow.o \
$(OBJS)\monodll_bmpcboxg.o \
$(OBJS)\monodll_calctrlg.o \
$(OBJS)\monodll_commandlinkbuttong.o \
@@ -2336,6 +2342,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_sashwin.o \
$(OBJS)\monodll_splash.o \
$(OBJS)\monodll_tipdlg.o \
$(OBJS)\monodll_treelist.o \
$(OBJS)\monodll_wizard.o \
$(OBJS)\monodll_taskbarcmn.o \
$(OBJS)\monodll_aboutdlg.o \
@@ -2394,6 +2401,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_debugrpt.o \
$(OBJS)\monolib_dbgrptg.o \
$(OBJS)\monolib_xh_animatctrl.o \
$(OBJS)\monolib_xh_bannerwindow.o \
$(OBJS)\monolib_xh_bmp.o \
$(OBJS)\monolib_xh_bmpcbox.o \
$(OBJS)\monolib_xh_bmpbt.o \
@@ -3046,6 +3054,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_hyperlnkcmn.o \
$(OBJS)\monolib_odcombocmn.o \
$(OBJS)\monolib_aboutdlgg.o \
$(OBJS)\monolib_bannerwindow.o \
$(OBJS)\monolib_bmpcboxg.o \
$(OBJS)\monolib_calctrlg.o \
$(OBJS)\monolib_commandlinkbuttong.o \
@@ -3065,6 +3074,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_sashwin.o \
$(OBJS)\monolib_splash.o \
$(OBJS)\monolib_tipdlg.o \
$(OBJS)\monolib_treelist.o \
$(OBJS)\monolib_wizard.o \
$(OBJS)\monolib_taskbarcmn.o \
$(OBJS)\monolib_aboutdlg.o \
@@ -3090,6 +3100,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_hyperlnkcmn.o \
$(OBJS)\monolib_odcombocmn.o \
$(OBJS)\monolib_aboutdlgg.o \
$(OBJS)\monolib_bannerwindow.o \
$(OBJS)\monolib_bmpcboxg.o \
$(OBJS)\monolib_calctrlg.o \
$(OBJS)\monolib_commandlinkbuttong.o \
@@ -3109,6 +3120,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_sashwin.o \
$(OBJS)\monolib_splash.o \
$(OBJS)\monolib_tipdlg.o \
$(OBJS)\monolib_treelist.o \
$(OBJS)\monolib_wizard.o \
$(OBJS)\monolib_taskbarcmn.o \
$(OBJS)\monolib_aboutdlg.o \
@@ -4278,6 +4290,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_hyperlnkcmn.o \
$(OBJS)\advdll_odcombocmn.o \
$(OBJS)\advdll_aboutdlgg.o \
$(OBJS)\advdll_bannerwindow.o \
$(OBJS)\advdll_bmpcboxg.o \
$(OBJS)\advdll_calctrlg.o \
$(OBJS)\advdll_commandlinkbuttong.o \
@@ -4297,6 +4310,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_sashwin.o \
$(OBJS)\advdll_splash.o \
$(OBJS)\advdll_tipdlg.o \
$(OBJS)\advdll_treelist.o \
$(OBJS)\advdll_wizard.o \
$(OBJS)\advdll_taskbarcmn.o \
$(OBJS)\advdll_aboutdlg.o \
@@ -4322,6 +4336,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_hyperlnkcmn.o \
$(OBJS)\advdll_odcombocmn.o \
$(OBJS)\advdll_aboutdlgg.o \
$(OBJS)\advdll_bannerwindow.o \
$(OBJS)\advdll_bmpcboxg.o \
$(OBJS)\advdll_calctrlg.o \
$(OBJS)\advdll_commandlinkbuttong.o \
@@ -4341,6 +4356,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_sashwin.o \
$(OBJS)\advdll_splash.o \
$(OBJS)\advdll_tipdlg.o \
$(OBJS)\advdll_treelist.o \
$(OBJS)\advdll_wizard.o \
$(OBJS)\advdll_taskbarcmn.o \
$(OBJS)\advdll_aboutdlg.o \
@@ -4368,6 +4384,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_hyperlnkcmn.o \
$(OBJS)\advlib_odcombocmn.o \
$(OBJS)\advlib_aboutdlgg.o \
$(OBJS)\advlib_bannerwindow.o \
$(OBJS)\advlib_bmpcboxg.o \
$(OBJS)\advlib_calctrlg.o \
$(OBJS)\advlib_commandlinkbuttong.o \
@@ -4387,6 +4404,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_sashwin.o \
$(OBJS)\advlib_splash.o \
$(OBJS)\advlib_tipdlg.o \
$(OBJS)\advlib_treelist.o \
$(OBJS)\advlib_wizard.o \
$(OBJS)\advlib_taskbarcmn.o \
$(OBJS)\advlib_aboutdlg.o \
@@ -4412,6 +4430,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_hyperlnkcmn.o \
$(OBJS)\advlib_odcombocmn.o \
$(OBJS)\advlib_aboutdlgg.o \
$(OBJS)\advlib_bannerwindow.o \
$(OBJS)\advlib_bmpcboxg.o \
$(OBJS)\advlib_calctrlg.o \
$(OBJS)\advlib_commandlinkbuttong.o \
@@ -4431,6 +4450,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_sashwin.o \
$(OBJS)\advlib_splash.o \
$(OBJS)\advlib_tipdlg.o \
$(OBJS)\advlib_treelist.o \
$(OBJS)\advlib_wizard.o \
$(OBJS)\advlib_taskbarcmn.o \
$(OBJS)\advlib_aboutdlg.o \
@@ -6953,6 +6973,9 @@ $(OBJS)\monodll_dbgrptg.o: ../../src/generic/dbgrptg.cpp
$(OBJS)\monodll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8371,6 +8394,11 @@ $(OBJS)\monodll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_bannerwindow.o: ../../src/generic/bannerwindow.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8466,6 +8494,11 @@ $(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_treelist.o: ../../src/generic/treelist.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_wizard.o: ../../src/generic/wizard.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9313,6 +9346,9 @@ $(OBJS)\monolib_dbgrptg.o: ../../src/generic/dbgrptg.cpp
$(OBJS)\monolib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10731,6 +10767,11 @@ $(OBJS)\monolib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_bannerwindow.o: ../../src/generic/bannerwindow.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10826,6 +10867,11 @@ $(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_treelist.o: ../../src/generic/treelist.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_wizard.o: ../../src/generic/wizard.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14489,6 +14535,9 @@ $(OBJS)\advdll_odcombocmn.o: ../../src/common/odcombocmn.cpp
$(OBJS)\advdll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_bannerwindow.o: ../../src/generic/bannerwindow.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14546,6 +14595,9 @@ $(OBJS)\advdll_splash.o: ../../src/generic/splash.cpp
$(OBJS)\advdll_tipdlg.o: ../../src/generic/tipdlg.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_treelist.o: ../../src/generic/treelist.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_wizard.o: ../../src/generic/wizard.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14615,6 +14667,9 @@ $(OBJS)\advlib_odcombocmn.o: ../../src/common/odcombocmn.cpp
$(OBJS)\advlib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_bannerwindow.o: ../../src/generic/bannerwindow.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14672,6 +14727,9 @@ $(OBJS)\advlib_splash.o: ../../src/generic/splash.cpp
$(OBJS)\advlib_tipdlg.o: ../../src/generic/tipdlg.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_treelist.o: ../../src/generic/treelist.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_wizard.o: ../../src/generic/wizard.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14972,6 +15030,9 @@ $(OBJS)\xrcdll_version_rc.o: ../../src/msw/version.rc
$(OBJS)\xrcdll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -15164,6 +15225,9 @@ $(OBJS)\xrclib_dummy.o: ../../src/common/dummy.cpp
$(OBJS)\xrclib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<

64
build/msw/makefile.vc
View File

@@ -1246,6 +1246,7 @@ XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_426)$(__DEBUGRUNTIME) /DWIN32 \
XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_dummy.obj \
$(OBJS)\xrcdll_xh_animatctrl.obj \
$(OBJS)\xrcdll_xh_bannerwindow.obj \
$(OBJS)\xrcdll_xh_bmp.obj \
$(OBJS)\xrcdll_xh_bmpcbox.obj \
$(OBJS)\xrcdll_xh_bmpbt.obj \
@@ -1324,6 +1325,7 @@ XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \
XRCLIB_OBJECTS = \
$(OBJS)\xrclib_dummy.obj \
$(OBJS)\xrclib_xh_animatctrl.obj \
$(OBJS)\xrclib_xh_bannerwindow.obj \
$(OBJS)\xrclib_xh_bmp.obj \
$(OBJS)\xrclib_xh_bmpcbox.obj \
$(OBJS)\xrclib_xh_bmpbt.obj \
@@ -1824,6 +1826,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_debugrpt.obj \
$(OBJS)\monodll_dbgrptg.obj \
$(OBJS)\monodll_xh_animatctrl.obj \
$(OBJS)\monodll_xh_bannerwindow.obj \
$(OBJS)\monodll_xh_bmp.obj \
$(OBJS)\monodll_xh_bmpcbox.obj \
$(OBJS)\monodll_xh_bmpbt.obj \
@@ -2472,6 +2475,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_hyperlnkcmn.obj \
$(OBJS)\monodll_odcombocmn.obj \
$(OBJS)\monodll_aboutdlgg.obj \
$(OBJS)\monodll_bannerwindow.obj \
$(OBJS)\monodll_bmpcboxg.obj \
$(OBJS)\monodll_calctrlg.obj \
$(OBJS)\monodll_commandlinkbuttong.obj \
@@ -2491,6 +2495,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_sashwin.obj \
$(OBJS)\monodll_splash.obj \
$(OBJS)\monodll_tipdlg.obj \
$(OBJS)\monodll_treelist.obj \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_aboutdlg.obj \
@@ -2516,6 +2521,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_hyperlnkcmn.obj \
$(OBJS)\monodll_odcombocmn.obj \
$(OBJS)\monodll_aboutdlgg.obj \
$(OBJS)\monodll_bannerwindow.obj \
$(OBJS)\monodll_bmpcboxg.obj \
$(OBJS)\monodll_calctrlg.obj \
$(OBJS)\monodll_commandlinkbuttong.obj \
@@ -2535,6 +2541,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_sashwin.obj \
$(OBJS)\monodll_splash.obj \
$(OBJS)\monodll_tipdlg.obj \
$(OBJS)\monodll_treelist.obj \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_aboutdlg.obj \
@@ -2597,6 +2604,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_debugrpt.obj \
$(OBJS)\monolib_dbgrptg.obj \
$(OBJS)\monolib_xh_animatctrl.obj \
$(OBJS)\monolib_xh_bannerwindow.obj \
$(OBJS)\monolib_xh_bmp.obj \
$(OBJS)\monolib_xh_bmpcbox.obj \
$(OBJS)\monolib_xh_bmpbt.obj \
@@ -3245,6 +3253,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_hyperlnkcmn.obj \
$(OBJS)\monolib_odcombocmn.obj \
$(OBJS)\monolib_aboutdlgg.obj \
$(OBJS)\monolib_bannerwindow.obj \
$(OBJS)\monolib_bmpcboxg.obj \
$(OBJS)\monolib_calctrlg.obj \
$(OBJS)\monolib_commandlinkbuttong.obj \
@@ -3264,6 +3273,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_sashwin.obj \
$(OBJS)\monolib_splash.obj \
$(OBJS)\monolib_tipdlg.obj \
$(OBJS)\monolib_treelist.obj \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_aboutdlg.obj \
@@ -3289,6 +3299,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_hyperlnkcmn.obj \
$(OBJS)\monolib_odcombocmn.obj \
$(OBJS)\monolib_aboutdlgg.obj \
$(OBJS)\monolib_bannerwindow.obj \
$(OBJS)\monolib_bmpcboxg.obj \
$(OBJS)\monolib_calctrlg.obj \
$(OBJS)\monolib_commandlinkbuttong.obj \
@@ -3308,6 +3319,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_sashwin.obj \
$(OBJS)\monolib_splash.obj \
$(OBJS)\monolib_tipdlg.obj \
$(OBJS)\monolib_treelist.obj \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_aboutdlg.obj \
@@ -4539,6 +4551,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_hyperlnkcmn.obj \
$(OBJS)\advdll_odcombocmn.obj \
$(OBJS)\advdll_aboutdlgg.obj \
$(OBJS)\advdll_bannerwindow.obj \
$(OBJS)\advdll_bmpcboxg.obj \
$(OBJS)\advdll_calctrlg.obj \
$(OBJS)\advdll_commandlinkbuttong.obj \
@@ -4558,6 +4571,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_sashwin.obj \
$(OBJS)\advdll_splash.obj \
$(OBJS)\advdll_tipdlg.obj \
$(OBJS)\advdll_treelist.obj \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_aboutdlg.obj \
@@ -4583,6 +4597,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_hyperlnkcmn.obj \
$(OBJS)\advdll_odcombocmn.obj \
$(OBJS)\advdll_aboutdlgg.obj \
$(OBJS)\advdll_bannerwindow.obj \
$(OBJS)\advdll_bmpcboxg.obj \
$(OBJS)\advdll_calctrlg.obj \
$(OBJS)\advdll_commandlinkbuttong.obj \
@@ -4602,6 +4617,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_sashwin.obj \
$(OBJS)\advdll_splash.obj \
$(OBJS)\advdll_tipdlg.obj \
$(OBJS)\advdll_treelist.obj \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_aboutdlg.obj \
@@ -4631,6 +4647,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_hyperlnkcmn.obj \
$(OBJS)\advlib_odcombocmn.obj \
$(OBJS)\advlib_aboutdlgg.obj \
$(OBJS)\advlib_bannerwindow.obj \
$(OBJS)\advlib_bmpcboxg.obj \
$(OBJS)\advlib_calctrlg.obj \
$(OBJS)\advlib_commandlinkbuttong.obj \
@@ -4650,6 +4667,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_sashwin.obj \
$(OBJS)\advlib_splash.obj \
$(OBJS)\advlib_tipdlg.obj \
$(OBJS)\advlib_treelist.obj \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_aboutdlg.obj \
@@ -4675,6 +4693,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_hyperlnkcmn.obj \
$(OBJS)\advlib_odcombocmn.obj \
$(OBJS)\advlib_aboutdlgg.obj \
$(OBJS)\advlib_bannerwindow.obj \
$(OBJS)\advlib_bmpcboxg.obj \
$(OBJS)\advlib_calctrlg.obj \
$(OBJS)\advlib_commandlinkbuttong.obj \
@@ -4694,6 +4713,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_sashwin.obj \
$(OBJS)\advlib_splash.obj \
$(OBJS)\advlib_tipdlg.obj \
$(OBJS)\advlib_treelist.obj \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_aboutdlg.obj \
@@ -7391,6 +7411,9 @@ $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
$(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
$(OBJS)\monodll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp
$(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
@@ -8809,6 +8832,11 @@ $(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
@@ -8904,6 +8932,11 @@ $(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\wizard.cpp
@@ -9751,6 +9784,9 @@ $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
$(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
$(OBJS)\monolib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp
$(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
@@ -11169,6 +11205,11 @@ $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
@@ -11264,6 +11305,11 @@ $(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp
@@ -14927,6 +14973,9 @@ $(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
$(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
@@ -14984,6 +15033,9 @@ $(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
$(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp
@@ -15053,6 +15105,9 @@ $(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
$(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
@@ -15110,6 +15165,9 @@ $(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
$(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp
@@ -15410,6 +15468,9 @@ $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
$(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
$(OBJS)\xrcdll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp
$(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp
@@ -15602,6 +15663,9 @@ $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
$(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
$(OBJS)\xrclib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp
$(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp

64
build/msw/makefile.wat
View File

@@ -141,6 +141,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_debugrpt.obj &
$(OBJS)\monodll_dbgrptg.obj &
$(OBJS)\monodll_xh_animatctrl.obj &
$(OBJS)\monodll_xh_bannerwindow.obj &
$(OBJS)\monodll_xh_bmp.obj &
$(OBJS)\monodll_xh_bmpcbox.obj &
$(OBJS)\monodll_xh_bmpbt.obj &
@@ -795,6 +796,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_hyperlnkcmn.obj &
$(OBJS)\monodll_odcombocmn.obj &
$(OBJS)\monodll_aboutdlgg.obj &
$(OBJS)\monodll_bannerwindow.obj &
$(OBJS)\monodll_bmpcboxg.obj &
$(OBJS)\monodll_calctrlg.obj &
$(OBJS)\monodll_commandlinkbuttong.obj &
@@ -814,6 +816,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_sashwin.obj &
$(OBJS)\monodll_splash.obj &
$(OBJS)\monodll_tipdlg.obj &
$(OBJS)\monodll_treelist.obj &
$(OBJS)\monodll_wizard.obj &
$(OBJS)\monodll_taskbarcmn.obj &
$(OBJS)\monodll_aboutdlg.obj &
@@ -839,6 +842,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_hyperlnkcmn.obj &
$(OBJS)\monodll_odcombocmn.obj &
$(OBJS)\monodll_aboutdlgg.obj &
$(OBJS)\monodll_bannerwindow.obj &
$(OBJS)\monodll_bmpcboxg.obj &
$(OBJS)\monodll_calctrlg.obj &
$(OBJS)\monodll_commandlinkbuttong.obj &
@@ -858,6 +862,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_sashwin.obj &
$(OBJS)\monodll_splash.obj &
$(OBJS)\monodll_tipdlg.obj &
$(OBJS)\monodll_treelist.obj &
$(OBJS)\monodll_wizard.obj &
$(OBJS)\monodll_taskbarcmn.obj &
$(OBJS)\monodll_aboutdlg.obj &
@@ -919,6 +924,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_debugrpt.obj &
$(OBJS)\monolib_dbgrptg.obj &
$(OBJS)\monolib_xh_animatctrl.obj &
$(OBJS)\monolib_xh_bannerwindow.obj &
$(OBJS)\monolib_xh_bmp.obj &
$(OBJS)\monolib_xh_bmpcbox.obj &
$(OBJS)\monolib_xh_bmpbt.obj &
@@ -1573,6 +1579,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_hyperlnkcmn.obj &
$(OBJS)\monolib_odcombocmn.obj &
$(OBJS)\monolib_aboutdlgg.obj &
$(OBJS)\monolib_bannerwindow.obj &
$(OBJS)\monolib_bmpcboxg.obj &
$(OBJS)\monolib_calctrlg.obj &
$(OBJS)\monolib_commandlinkbuttong.obj &
@@ -1592,6 +1599,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_sashwin.obj &
$(OBJS)\monolib_splash.obj &
$(OBJS)\monolib_tipdlg.obj &
$(OBJS)\monolib_treelist.obj &
$(OBJS)\monolib_wizard.obj &
$(OBJS)\monolib_taskbarcmn.obj &
$(OBJS)\monolib_aboutdlg.obj &
@@ -1617,6 +1625,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_hyperlnkcmn.obj &
$(OBJS)\monolib_odcombocmn.obj &
$(OBJS)\monolib_aboutdlgg.obj &
$(OBJS)\monolib_bannerwindow.obj &
$(OBJS)\monolib_bmpcboxg.obj &
$(OBJS)\monolib_calctrlg.obj &
$(OBJS)\monolib_commandlinkbuttong.obj &
@@ -1636,6 +1645,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_sashwin.obj &
$(OBJS)\monolib_splash.obj &
$(OBJS)\monolib_tipdlg.obj &
$(OBJS)\monolib_treelist.obj &
$(OBJS)\monolib_wizard.obj &
$(OBJS)\monolib_taskbarcmn.obj &
$(OBJS)\monolib_aboutdlg.obj &
@@ -2821,6 +2831,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_hyperlnkcmn.obj &
$(OBJS)\advdll_odcombocmn.obj &
$(OBJS)\advdll_aboutdlgg.obj &
$(OBJS)\advdll_bannerwindow.obj &
$(OBJS)\advdll_bmpcboxg.obj &
$(OBJS)\advdll_calctrlg.obj &
$(OBJS)\advdll_commandlinkbuttong.obj &
@@ -2840,6 +2851,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_sashwin.obj &
$(OBJS)\advdll_splash.obj &
$(OBJS)\advdll_tipdlg.obj &
$(OBJS)\advdll_treelist.obj &
$(OBJS)\advdll_wizard.obj &
$(OBJS)\advdll_taskbarcmn.obj &
$(OBJS)\advdll_aboutdlg.obj &
@@ -2865,6 +2877,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_hyperlnkcmn.obj &
$(OBJS)\advdll_odcombocmn.obj &
$(OBJS)\advdll_aboutdlgg.obj &
$(OBJS)\advdll_bannerwindow.obj &
$(OBJS)\advdll_bmpcboxg.obj &
$(OBJS)\advdll_calctrlg.obj &
$(OBJS)\advdll_commandlinkbuttong.obj &
@@ -2884,6 +2897,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_sashwin.obj &
$(OBJS)\advdll_splash.obj &
$(OBJS)\advdll_tipdlg.obj &
$(OBJS)\advdll_treelist.obj &
$(OBJS)\advdll_wizard.obj &
$(OBJS)\advdll_taskbarcmn.obj &
$(OBJS)\advdll_aboutdlg.obj &
@@ -2913,6 +2927,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_hyperlnkcmn.obj &
$(OBJS)\advlib_odcombocmn.obj &
$(OBJS)\advlib_aboutdlgg.obj &
$(OBJS)\advlib_bannerwindow.obj &
$(OBJS)\advlib_bmpcboxg.obj &
$(OBJS)\advlib_calctrlg.obj &
$(OBJS)\advlib_commandlinkbuttong.obj &
@@ -2932,6 +2947,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_sashwin.obj &
$(OBJS)\advlib_splash.obj &
$(OBJS)\advlib_tipdlg.obj &
$(OBJS)\advlib_treelist.obj &
$(OBJS)\advlib_wizard.obj &
$(OBJS)\advlib_taskbarcmn.obj &
$(OBJS)\advlib_aboutdlg.obj &
@@ -2957,6 +2973,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_hyperlnkcmn.obj &
$(OBJS)\advlib_odcombocmn.obj &
$(OBJS)\advlib_aboutdlgg.obj &
$(OBJS)\advlib_bannerwindow.obj &
$(OBJS)\advlib_bmpcboxg.obj &
$(OBJS)\advlib_calctrlg.obj &
$(OBJS)\advlib_commandlinkbuttong.obj &
@@ -2976,6 +2993,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_sashwin.obj &
$(OBJS)\advlib_splash.obj &
$(OBJS)\advlib_tipdlg.obj &
$(OBJS)\advlib_treelist.obj &
$(OBJS)\advlib_wizard.obj &
$(OBJS)\advlib_taskbarcmn.obj &
$(OBJS)\advlib_aboutdlg.obj &
@@ -4624,6 +4642,7 @@ XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
XRCDLL_OBJECTS = &
$(OBJS)\xrcdll_dummy.obj &
$(OBJS)\xrcdll_xh_animatctrl.obj &
$(OBJS)\xrcdll_xh_bannerwindow.obj &
$(OBJS)\xrcdll_xh_bmp.obj &
$(OBJS)\xrcdll_xh_bmpcbox.obj &
$(OBJS)\xrcdll_xh_bmpbt.obj &
@@ -4698,6 +4717,7 @@ XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
XRCLIB_OBJECTS = &
$(OBJS)\xrclib_dummy.obj &
$(OBJS)\xrclib_xh_animatctrl.obj &
$(OBJS)\xrclib_xh_bannerwindow.obj &
$(OBJS)\xrclib_xh_bmp.obj &
$(OBJS)\xrclib_xh_bmpcbox.obj &
$(OBJS)\xrclib_xh_bmpbt.obj &
@@ -7224,6 +7244,9 @@ $(OBJS)\monodll_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
$(OBJS)\monodll_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8642,6 +8665,11 @@ $(OBJS)\monodll_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8737,6 +8765,11 @@ $(OBJS)\monodll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -9584,6 +9617,9 @@ $(OBJS)\monolib_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
$(OBJS)\monolib_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -11002,6 +11038,11 @@ $(OBJS)\monolib_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -11097,6 +11138,11 @@ $(OBJS)\monolib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -14760,6 +14806,9 @@ $(OBJS)\advdll_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp
$(OBJS)\advdll_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
@@ -14817,6 +14866,9 @@ $(OBJS)\advdll_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp
$(OBJS)\advdll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
@@ -14886,6 +14938,9 @@ $(OBJS)\advlib_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp
$(OBJS)\advlib_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
@@ -14943,6 +14998,9 @@ $(OBJS)\advlib_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp
$(OBJS)\advlib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
@@ -15243,6 +15301,9 @@ $(OBJS)\xrcdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
$(OBJS)\xrcdll_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrcdll_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrcdll_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
@@ -15435,6 +15496,9 @@ $(OBJS)\xrclib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(OBJS)\xrclib_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\xrclib_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\xrclib_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<

16
build/msw/wx_adv.dsp
View File

@@ -563,6 +563,10 @@ SOURCE=..\..\src\generic\animateg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\bannerwindow.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\bmpcboxg.cpp
# End Source File
# Begin Source File
@@ -639,6 +643,10 @@ SOURCE=..\..\src\generic\tipdlg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\treelist.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\wizard.cpp
# End Source File
# End Group
@@ -1012,6 +1020,10 @@ SOURCE=..\..\include\wx\animate.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\bannerwindow.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\bmpcbox.h
# End Source File
# Begin Source File
@@ -1096,6 +1108,10 @@ SOURCE=..\..\include\wx\tipdlg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\treelist.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\wizard.h
# End Source File
# End Group

28
build/msw/wx_core.dsp
View File

@@ -5684,6 +5684,10 @@ SOURCE=..\..\include\wx\generic\wizard.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\univ\anybutton.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\univ\app.h
# End Source File
# Begin Source File
@@ -5984,6 +5988,10 @@ SOURCE=..\..\include\wx\aui\auibook.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\bannerwindow.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\ribbon\bar.h
# End Source File
# Begin Source File
@@ -6444,6 +6452,10 @@ SOURCE=..\..\include\wx\infobar.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\itemid.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\joystick.h
# End Source File
# Begin Source File
@@ -6796,6 +6808,10 @@ SOURCE=..\..\include\wx\splash.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\persist\splitter.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\splitter.h
# End Source File
# Begin Source File
@@ -6912,6 +6928,10 @@ SOURCE=..\..\include\wx\treectrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\treelist.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\uiaction.h
# End Source File
# Begin Source File
@@ -6960,6 +6980,10 @@ SOURCE=..\..\include\wx\windowid.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\withimages.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\wizard.h
# End Source File
# Begin Source File
@@ -6984,6 +7008,10 @@ SOURCE=..\..\include\wx\xrc\xh_animatctrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_bannerwindow.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_bmp.h
# End Source File
# Begin Source File

12
build/msw/wx_vc7_adv.vcproj
View File

@@ -737,6 +737,9 @@
<File
RelativePath="..\..\src\generic\animateg.cpp">
</File>
<File
RelativePath="..\..\src\generic\bannerwindow.cpp">
</File>
<File
RelativePath="..\..\src\generic\bmpcboxg.cpp">
</File>
@@ -794,6 +797,9 @@
<File
RelativePath="..\..\src\generic\tipdlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\treelist.cpp">
</File>
<File
RelativePath="..\..\src\generic\wizard.cpp">
</File>
@@ -1067,6 +1073,9 @@
<File
RelativePath="..\..\include\wx\animate.h">
</File>
<File
RelativePath="..\..\include\wx\bannerwindow.h">
</File>
<File
RelativePath="..\..\include\wx\bmpcbox.h">
</File>
@@ -1130,6 +1139,9 @@
<File
RelativePath="..\..\include\wx\tipdlg.h">
</File>
<File
RelativePath="..\..\include\wx\treelist.h">
</File>
<File
RelativePath="..\..\include\wx\wizard.h">
</File>

21
build/msw/wx_vc7_core.vcproj
View File

@@ -4836,6 +4836,9 @@
<Filter
Name="wxUniv Headers"
UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">
<File
RelativePath="..\..\include\wx\univ\anybutton.h">
</File>
<File
RelativePath="..\..\include\wx\univ\app.h">
</File>
@@ -5063,6 +5066,9 @@
<File
RelativePath="..\..\include\wx\aui\auibook.h">
</File>
<File
RelativePath="..\..\include\wx\bannerwindow.h">
</File>
<File
RelativePath="..\..\include\wx\ribbon\bar.h">
</File>
@@ -5408,6 +5414,9 @@
<File
RelativePath="..\..\include\wx\infobar.h">
</File>
<File
RelativePath="..\..\include\wx\itemid.h">
</File>
<File
RelativePath="..\..\include\wx\joystick.h">
</File>
@@ -5672,6 +5681,9 @@
<File
RelativePath="..\..\include\wx\splash.h">
</File>
<File
RelativePath="..\..\include\wx\persist\splitter.h">
</File>
<File
RelativePath="..\..\include\wx\splitter.h">
</File>
@@ -5759,6 +5771,9 @@
<File
RelativePath="..\..\include\wx\treectrl.h">
</File>
<File
RelativePath="..\..\include\wx\treelist.h">
</File>
<File
RelativePath="..\..\include\wx\uiaction.h">
</File>
@@ -5795,6 +5810,9 @@
<File
RelativePath="..\..\include\wx\windowid.h">
</File>
<File
RelativePath="..\..\include\wx\withimages.h">
</File>
<File
RelativePath="..\..\include\wx\wizard.h">
</File>
@@ -5813,6 +5831,9 @@
<File
RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmp.h">
</File>

6
build/msw/wx_vc7_xrc.vcproj
View File

@@ -777,6 +777,9 @@
<File
RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmp.h">
</File>
@@ -965,6 +968,9 @@
<File
RelativePath="..\..\src\xrc\xh_animatctrl.cpp">
</File>
<File
RelativePath="..\..\src\xrc\xh_bannerwindow.cpp">
</File>
<File
RelativePath="..\..\src\xrc\xh_bmp.cpp">
</File>

16
build/msw/wx_vc8_adv.vcproj
View File

@@ -1016,6 +1016,10 @@
RelativePath="..\..\src\generic\animateg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bannerwindow.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bmpcboxg.cpp"
>
@@ -1092,6 +1096,10 @@
RelativePath="..\..\src\generic\tipdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\treelist.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\wizard.cpp"
>
@@ -1444,6 +1452,10 @@
RelativePath="..\..\include\wx\animate.h"
>
</File>
<File
RelativePath="..\..\include\wx\bannerwindow.h"
>
</File>
<File
RelativePath="..\..\include\wx\bmpcbox.h"
>
@@ -1528,6 +1540,10 @@
RelativePath="..\..\include\wx\tipdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\treelist.h"
>
</File>
<File
RelativePath="..\..\include\wx\wizard.h"
>

28
build/msw/wx_vc8_core.vcproj
View File

@@ -6469,6 +6469,10 @@
Name="wxUniv Headers"
UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}"
>
<File
RelativePath="..\..\include\wx\univ\anybutton.h"
>
</File>
<File
RelativePath="..\..\include\wx\univ\app.h"
>
@@ -6771,6 +6775,10 @@
RelativePath="..\..\include\wx\aui\auibook.h"
>
</File>
<File
RelativePath="..\..\include\wx\bannerwindow.h"
>
</File>
<File
RelativePath="..\..\include\wx\ribbon\bar.h"
>
@@ -7231,6 +7239,10 @@
RelativePath="..\..\include\wx\infobar.h"
>
</File>
<File
RelativePath="..\..\include\wx\itemid.h"
>
</File>
<File
RelativePath="..\..\include\wx\joystick.h"
>
@@ -7583,6 +7595,10 @@
RelativePath="..\..\include\wx\splash.h"
>
</File>
<File
RelativePath="..\..\include\wx\persist\splitter.h"
>
</File>
<File
RelativePath="..\..\include\wx\splitter.h"
>
@@ -7699,6 +7715,10 @@
RelativePath="..\..\include\wx\treectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\treelist.h"
>
</File>
<File
RelativePath="..\..\include\wx\uiaction.h"
>
@@ -7747,6 +7767,10 @@
RelativePath="..\..\include\wx\windowid.h"
>
</File>
<File
RelativePath="..\..\include\wx\withimages.h"
>
</File>
<File
RelativePath="..\..\include\wx\wizard.h"
>
@@ -7771,6 +7795,10 @@
RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmp.h"
>

8
build/msw/wx_vc8_xrc.vcproj
View File

@@ -1058,6 +1058,10 @@
RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmp.h"
>
@@ -1308,6 +1312,10 @@
RelativePath="..\..\src\xrc\xh_animatctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_bannerwindow.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_bmp.cpp"
>

16
build/msw/wx_vc9_adv.vcproj
View File

@@ -1012,6 +1012,10 @@
RelativePath="..\..\src\generic\animateg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bannerwindow.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bmpcboxg.cpp"
>
@@ -1088,6 +1092,10 @@
RelativePath="..\..\src\generic\tipdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\treelist.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\wizard.cpp"
>
@@ -1440,6 +1448,10 @@
RelativePath="..\..\include\wx\animate.h"
>
</File>
<File
RelativePath="..\..\include\wx\bannerwindow.h"
>
</File>
<File
RelativePath="..\..\include\wx\bmpcbox.h"
>
@@ -1524,6 +1536,10 @@
RelativePath="..\..\include\wx\tipdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\treelist.h"
>
</File>
<File
RelativePath="..\..\include\wx\wizard.h"
>

28
build/msw/wx_vc9_core.vcproj
View File

@@ -6465,6 +6465,10 @@
Name="wxUniv Headers"
UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}"
>
<File
RelativePath="..\..\include\wx\univ\anybutton.h"
>
</File>
<File
RelativePath="..\..\include\wx\univ\app.h"
>
@@ -6767,6 +6771,10 @@
RelativePath="..\..\include\wx\aui\auibook.h"
>
</File>
<File
RelativePath="..\..\include\wx\bannerwindow.h"
>
</File>
<File
RelativePath="..\..\include\wx\ribbon\bar.h"
>
@@ -7227,6 +7235,10 @@
RelativePath="..\..\include\wx\infobar.h"
>
</File>
<File
RelativePath="..\..\include\wx\itemid.h"
>
</File>
<File
RelativePath="..\..\include\wx\joystick.h"
>
@@ -7579,6 +7591,10 @@
RelativePath="..\..\include\wx\splash.h"
>
</File>
<File
RelativePath="..\..\include\wx\persist\splitter.h"
>
</File>
<File
RelativePath="..\..\include\wx\splitter.h"
>
@@ -7695,6 +7711,10 @@
RelativePath="..\..\include\wx\treectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\treelist.h"
>
</File>
<File
RelativePath="..\..\include\wx\uiaction.h"
>
@@ -7743,6 +7763,10 @@
RelativePath="..\..\include\wx\windowid.h"
>
</File>
<File
RelativePath="..\..\include\wx\withimages.h"
>
</File>
<File
RelativePath="..\..\include\wx\wizard.h"
>
@@ -7767,6 +7791,10 @@
RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmp.h"
>

8
build/msw/wx_vc9_xrc.vcproj
View File

@@ -1054,6 +1054,10 @@
RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_bmp.h"
>
@@ -1304,6 +1308,10 @@
RelativePath="..\..\src\xrc\xh_animatctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_bannerwindow.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_bmp.cpp"
>

8
build/msw/wx_xrc.dsp
View File

@@ -538,6 +538,10 @@ SOURCE=..\..\include\wx\xrc\xh_animatctrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_bannerwindow.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_bmp.h
# End Source File
# Begin Source File
@@ -786,6 +790,10 @@ SOURCE=..\..\src\xrc\xh_animatctrl.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\xrc\xh_bannerwindow.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\xrc\xh_bmp.cpp
# End Source File
# Begin Source File

26
build/osx/makeprojects.applescript
View File

@@ -160,14 +160,26 @@ end readFilesList
-- creates a new project file from the respective template
on instantiateProject(theProject)
set projectName to projectName of theProject
set template to POSIX file (osxBuildFolder & projectName & "_in.xcodeproj")
set projectFile to POSIX file (osxBuildFolder & projectName & ".xcodeproj")
set template to (osxBuildFolder & projectName & "_in.xcodeproj")
set projectFile to (osxBuildFolder & projectName & ".xcodeproj")
tell application "Finder"
try
delete file projectFile
end try
set duplicateProject to duplicate template with replace
set name of duplicateProject to (projectName & ".xcodeproj")
if exists projectFile as POSIX file then
set templateContentFile to (osxBuildFolder & projectName & "_in.xcodeproj/project.pbxproj")
set projectContentFile to (osxBuildFolder & projectName & ".xcodeproj/project.pbxproj")
try
tell me
do shell script "rm -f " & quoted form of projectContentFile
end tell
end try
try
tell me
do shell script "cp " & quoted form of templateContentFile & " " & quoted form of projectContentFile
end tell
end try
else
set duplicateProject to duplicate (template as POSIX file) with replace
set name of duplicateProject to (projectName & ".xcodeproj")
end if
end tell
end instantiateProject

26
build/osx/wxcarbon.xcodeproj/project.pbxproj
View File

@@ -45,6 +45,8 @@
056E30EA43753A7CB1AF8C9F /* strvararg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EEAD9C3E180305D8899441E /* strvararg.cpp */; };
05814571E7A83F5DBFB6E4C4 /* msgout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E968913A9A593B258BD8EACB /* msgout.cpp */; };
05814571E7A83F5DBFB6E4C5 /* msgout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E968913A9A593B258BD8EACB /* msgout.cpp */; };
060E095718B03EF98C754799 /* treelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5190E3E110443FD29F2474FC /* treelist.cpp */; };
060E095718B03EF98C75479A /* treelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5190E3E110443FD29F2474FC /* treelist.cpp */; };
064908348009398C8EA8497C /* fontpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */; };
064908348009398C8EA8497D /* fontpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */; };
0654BCC3F0763C50A7949504 /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */; };
@@ -689,6 +691,8 @@
6FA47EAACE613B039B6EC262 /* containr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3645350F572364BABF50238 /* containr.cpp */; };
700BBDECBE313E108BA99ABD /* toplvcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 861438BD294335D4B859EA71 /* toplvcmn.cpp */; };
700BBDECBE313E108BA99ABE /* toplvcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 861438BD294335D4B859EA71 /* toplvcmn.cpp */; };
702616D38A5B345D9CC87114 /* xh_bannerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3116006345D833509865FF7F /* xh_bannerwindow.cpp */; };
702616D38A5B345D9CC87115 /* xh_bannerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3116006345D833509865FF7F /* xh_bannerwindow.cpp */; };
70F898F8B129380BBECAC559 /* richtexthtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */; };
70F898F8B129380BBECAC55A /* richtexthtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */; };
7181709A030D3749AB355B74 /* xh_radbx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F43AF44465B335479752116D /* xh_radbx.cpp */; };
@@ -1375,6 +1379,8 @@
E05B06A7FEEE32D5AD87EA50 /* xh_editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05310A868F0B35999C568681 /* xh_editlbox.cpp */; };
E0E40333B61C33B58787078E /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */; };
E0E40333B61C33B58787078F /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */; };
E0FAB345D2933D42B62917A3 /* bannerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36296C259D023EAAA240FC79 /* bannerwindow.cpp */; };
E0FAB345D2933D42B62917A4 /* bannerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36296C259D023EAAA240FC79 /* bannerwindow.cpp */; };
E104017EE1A4357DAF84E1E6 /* auibook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A298576700C33F018616E7BD /* auibook.cpp */; };
E104017EE1A4357DAF84E1E7 /* auibook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A298576700C33F018616E7BD /* auibook.cpp */; };
E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */; };
@@ -1739,6 +1745,7 @@
30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexGAP.cxx; path = ../../src/stc/scintilla/src/LexGAP.cxx; sourceTree = "<group>"; };
30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontcmn.cpp; path = ../../src/common/fontcmn.cpp; sourceTree = "<group>"; };
30FD1048328234E59D319863 /* tif_fax3.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_fax3.c; path = ../../src/tiff/libtiff/tif_fax3.c; sourceTree = "<group>"; };
3116006345D833509865FF7F /* xh_bannerwindow.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bannerwindow.cpp; path = ../../src/xrc/xh_bannerwindow.cpp; sourceTree = "<group>"; };
31F4B9B03D52339B8F82C114 /* variant.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = variant.cpp; path = ../../src/common/variant.cpp; sourceTree = "<group>"; };
326723AEB79A305F90D6B41D /* advprops.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = advprops.cpp; path = ../../src/propgrid/advprops.cpp; sourceTree = "<group>"; };
32B2BC8A91983DDA9CC46793 /* statbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbox.cpp; path = ../../src/osx/carbon/statbox.cpp; sourceTree = "<group>"; };
@@ -1746,6 +1753,7 @@
346C68F0CCD23823B78267F0 /* tif_lzw.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_lzw.c; path = ../../src/tiff/libtiff/tif_lzw.c; sourceTree = "<group>"; };
3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSmalltalk.cxx; path = ../../src/stc/scintilla/src/LexSmalltalk.cxx; sourceTree = "<group>"; };
358D0A3AC73F322EA732D020 /* pngrutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrutil.c; path = ../../src/png/pngrutil.c; sourceTree = "<group>"; };
36296C259D023EAAA240FC79 /* bannerwindow.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bannerwindow.cpp; path = ../../src/generic/bannerwindow.cpp; sourceTree = "<group>"; };
36E1DBA275AD325DB759C180 /* fontenum.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontenum.cpp; path = ../../src/osx/core/fontenum.cpp; sourceTree = "<group>"; };
36F7955F8075343C8A9953DB /* LexPowerShell.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerShell.cxx; path = ../../src/stc/scintilla/src/LexPowerShell.cxx; sourceTree = "<group>"; };
3720038D64CF3C0B8F642A90 /* tokenzr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tokenzr.cpp; path = ../../src/common/tokenzr.cpp; sourceTree = "<group>"; };
@@ -1821,6 +1829,7 @@
508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/src/LexSpecman.cxx; sourceTree = "<group>"; };
5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/src/LexLua.cxx; sourceTree = "<group>"; };
5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = "<group>"; };
5190E3E110443FD29F2474FC /* treelist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treelist.cpp; path = ../../src/generic/treelist.cpp; sourceTree = "<group>"; };
5219A792C6A736F193D4A82F /* ContractionState.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContractionState.cxx; path = ../../src/stc/scintilla/src/ContractionState.cxx; sourceTree = "<group>"; };
5248A45AB113341EAC361910 /* notebook_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = notebook_osx.cpp; path = ../../src/osx/notebook_osx.cpp; sourceTree = "<group>"; };
52FE1599218730CC99A3F801 /* m_dflist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_dflist.cpp; path = ../../src/html/m_dflist.cpp; sourceTree = "<group>"; };
@@ -2617,6 +2626,7 @@
isa = PBXGroup;
children = (
8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */,
3116006345D833509865FF7F /* xh_bannerwindow.cpp */,
07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */,
8826A683573F35EA9789612C /* xh_bmpcbox.cpp */,
11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */,
@@ -2878,6 +2888,7 @@
isa = PBXGroup;
children = (
77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */,
36296C259D023EAAA240FC79 /* bannerwindow.cpp */,
13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */,
496674699F173A5385EAFF07 /* calctrlg.cpp */,
E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */,
@@ -2897,6 +2908,7 @@
917F2666B67E3D2EB84E74F8 /* sashwin.cpp */,
3F8836E29C5A370E80CE070E /* splash.cpp */,
B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */,
5190E3E110443FD29F2474FC /* treelist.cpp */,
8F08F70E1EF239999A4D2AC4 /* wizard.cpp */,
580AFC66F3003582B43043B1 /* animateg.cpp */,
);
@@ -4247,6 +4259,7 @@
7B4DA2F5F25B3E188CBAFE39 /* hyperlnkcmn.cpp in Sources */,
E6D18B2EDE353F67883085A0 /* odcombocmn.cpp in Sources */,
FEA741A9B6663A4C929893C3 /* aboutdlgg.cpp in Sources */,
E0FAB345D2933D42B62917A4 /* bannerwindow.cpp in Sources */,
B189DB62AE9F30A1B613756C /* bmpcboxg.cpp in Sources */,
2F50DBC14FE538A49823925B /* calctrlg.cpp in Sources */,
8A662992FFCB32E99D11950D /* commandlinkbuttong.cpp in Sources */,
@@ -4266,6 +4279,7 @@
3554C88010CE3D2A8970A136 /* sashwin.cpp in Sources */,
8AA341CCFB8E3F6AB3523596 /* splash.cpp in Sources */,
77BC918AF05C30E8A0BD27F9 /* tipdlg.cpp in Sources */,
060E095718B03EF98C75479A /* treelist.cpp in Sources */,
82FA4AA043213728AC266701 /* wizard.cpp in Sources */,
D00AF125FCB63A7A8F9B87DF /* taskbarcmn.cpp in Sources */,
46F341B46F80376B962759F6 /* animateg.cpp in Sources */,
@@ -4306,6 +4320,7 @@
2A7640E4210334AC93366901 /* winpars.cpp in Sources */,
87AA9C5D887B3C31A2AFB49E /* htmllbox.cpp in Sources */,
FBE4DB30865D3177B3A9993C /* xh_animatctrl.cpp in Sources */,
702616D38A5B345D9CC87115 /* xh_bannerwindow.cpp in Sources */,
94E510619F433AE3AC884756 /* xh_bmp.cpp in Sources */,
8966F77CC97B3ED780C8F138 /* xh_bmpcbox.cpp in Sources */,
84B3625464F732C3A79E1315 /* xh_bmpbt.cpp in Sources */,
@@ -5046,6 +5061,7 @@
7B4DA2F5F25B3E188CBAFE38 /* hyperlnkcmn.cpp in Sources */,
E6D18B2EDE353F678830859F /* odcombocmn.cpp in Sources */,
FEA741A9B6663A4C929893C2 /* aboutdlgg.cpp in Sources */,
E0FAB345D2933D42B62917A3 /* bannerwindow.cpp in Sources */,
B189DB62AE9F30A1B613756B /* bmpcboxg.cpp in Sources */,
2F50DBC14FE538A49823925A /* calctrlg.cpp in Sources */,
8A662992FFCB32E99D11950C /* commandlinkbuttong.cpp in Sources */,
@@ -5065,6 +5081,7 @@
3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */,
8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */,
77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */,
060E095718B03EF98C754799 /* treelist.cpp in Sources */,
82FA4AA043213728AC266700 /* wizard.cpp in Sources */,
D00AF125FCB63A7A8F9B87DE /* taskbarcmn.cpp in Sources */,
46F341B46F80376B962759F5 /* animateg.cpp in Sources */,
@@ -5105,6 +5122,7 @@
2A7640E4210334AC93366900 /* winpars.cpp in Sources */,
87AA9C5D887B3C31A2AFB49D /* htmllbox.cpp in Sources */,
FBE4DB30865D3177B3A9993B /* xh_animatctrl.cpp in Sources */,
702616D38A5B345D9CC87114 /* xh_bannerwindow.cpp in Sources */,
94E510619F433AE3AC884755 /* xh_bmp.cpp in Sources */,
8966F77CC97B3ED780C8F137 /* xh_bmpcbox.cpp in Sources */,
84B3625464F732C3A79E1314 /* xh_bmpbt.cpp in Sources */,
@@ -5429,10 +5447,6 @@
baseConfigurationReference = B44B32437825326C84607AD8 /* wxcarbon.xcconfig */;
buildSettings = {
EXECUTABLE_PREFIX = lib;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
WXUSINGDLL,
);
INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
@@ -5462,10 +5476,6 @@
baseConfigurationReference = B44B32437825326C84607AD8 /* wxcarbon.xcconfig */;
buildSettings = {
EXECUTABLE_PREFIX = lib;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
WXUSINGDLL,
);
INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",

18
build/osx/wxcocoa.xcodeproj/project.pbxproj
View File

@@ -45,6 +45,8 @@
056E30EA43753A7CB1AF8C9F /* strvararg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EEAD9C3E180305D8899441E /* strvararg.cpp */; };
05814571E7A83F5DBFB6E4C4 /* msgout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E968913A9A593B258BD8EACB /* msgout.cpp */; };
05814571E7A83F5DBFB6E4C5 /* msgout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E968913A9A593B258BD8EACB /* msgout.cpp */; };
060E095718B03EF98C754799 /* treelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5190E3E110443FD29F2474FC /* treelist.cpp */; };
060E095718B03EF98C75479A /* treelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5190E3E110443FD29F2474FC /* treelist.cpp */; };
064908348009398C8EA8497C /* fontpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */; };
064908348009398C8EA8497D /* fontpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */; };
0654BCC3F0763C50A7949504 /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */; };
@@ -705,6 +707,8 @@
6FA47EAACE613B039B6EC262 /* containr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3645350F572364BABF50238 /* containr.cpp */; };
700BBDECBE313E108BA99ABD /* toplvcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 861438BD294335D4B859EA71 /* toplvcmn.cpp */; };
700BBDECBE313E108BA99ABE /* toplvcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 861438BD294335D4B859EA71 /* toplvcmn.cpp */; };
702616D38A5B345D9CC87114 /* xh_bannerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3116006345D833509865FF7F /* xh_bannerwindow.cpp */; };
702616D38A5B345D9CC87115 /* xh_bannerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3116006345D833509865FF7F /* xh_bannerwindow.cpp */; };
70F898F8B129380BBECAC559 /* richtexthtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */; };
70F898F8B129380BBECAC55A /* richtexthtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */; };
7181709A030D3749AB355B74 /* xh_radbx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F43AF44465B335479752116D /* xh_radbx.cpp */; };
@@ -1373,6 +1377,8 @@
E05B06A7FEEE32D5AD87EA50 /* xh_editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05310A868F0B35999C568681 /* xh_editlbox.cpp */; };
E0E40333B61C33B58787078E /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */; };
E0E40333B61C33B58787078F /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */; };
E0FAB345D2933D42B62917A3 /* bannerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36296C259D023EAAA240FC79 /* bannerwindow.cpp */; };
E0FAB345D2933D42B62917A4 /* bannerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36296C259D023EAAA240FC79 /* bannerwindow.cpp */; };
E104017EE1A4357DAF84E1E6 /* auibook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A298576700C33F018616E7BD /* auibook.cpp */; };
E104017EE1A4357DAF84E1E7 /* auibook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A298576700C33F018616E7BD /* auibook.cpp */; };
E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */; };
@@ -1735,6 +1741,7 @@
30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexGAP.cxx; path = ../../src/stc/scintilla/src/LexGAP.cxx; sourceTree = "<group>"; };
30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontcmn.cpp; path = ../../src/common/fontcmn.cpp; sourceTree = "<group>"; };
30FD1048328234E59D319863 /* tif_fax3.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_fax3.c; path = ../../src/tiff/libtiff/tif_fax3.c; sourceTree = "<group>"; };
3116006345D833509865FF7F /* xh_bannerwindow.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bannerwindow.cpp; path = ../../src/xrc/xh_bannerwindow.cpp; sourceTree = "<group>"; };
31EFBD7D10003A5187348B35 /* tooltip.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = tooltip.mm; path = ../../src/osx/cocoa/tooltip.mm; sourceTree = "<group>"; };
31F4B9B03D52339B8F82C114 /* variant.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = variant.cpp; path = ../../src/common/variant.cpp; sourceTree = "<group>"; };
326723AEB79A305F90D6B41D /* advprops.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = advprops.cpp; path = ../../src/propgrid/advprops.cpp; sourceTree = "<group>"; };
@@ -1744,6 +1751,7 @@
35007225BB683683AA7C5E48 /* glcanvas.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = glcanvas.mm; path = ../../src/osx/cocoa/glcanvas.mm; sourceTree = "<group>"; };
3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSmalltalk.cxx; path = ../../src/stc/scintilla/src/LexSmalltalk.cxx; sourceTree = "<group>"; };
358D0A3AC73F322EA732D020 /* pngrutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrutil.c; path = ../../src/png/pngrutil.c; sourceTree = "<group>"; };
36296C259D023EAAA240FC79 /* bannerwindow.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bannerwindow.cpp; path = ../../src/generic/bannerwindow.cpp; sourceTree = "<group>"; };
36E1DBA275AD325DB759C180 /* fontenum.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontenum.cpp; path = ../../src/osx/core/fontenum.cpp; sourceTree = "<group>"; };
36F7955F8075343C8A9953DB /* LexPowerShell.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerShell.cxx; path = ../../src/stc/scintilla/src/LexPowerShell.cxx; sourceTree = "<group>"; };
3720038D64CF3C0B8F642A90 /* tokenzr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tokenzr.cpp; path = ../../src/common/tokenzr.cpp; sourceTree = "<group>"; };
@@ -1816,6 +1824,7 @@
508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/src/LexSpecman.cxx; sourceTree = "<group>"; };
5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/src/LexLua.cxx; sourceTree = "<group>"; };
5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = "<group>"; };
5190E3E110443FD29F2474FC /* treelist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treelist.cpp; path = ../../src/generic/treelist.cpp; sourceTree = "<group>"; };
5219A792C6A736F193D4A82F /* ContractionState.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContractionState.cxx; path = ../../src/stc/scintilla/src/ContractionState.cxx; sourceTree = "<group>"; };
5248A45AB113341EAC361910 /* notebook_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = notebook_osx.cpp; path = ../../src/osx/notebook_osx.cpp; sourceTree = "<group>"; };
52FE1599218730CC99A3F801 /* m_dflist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_dflist.cpp; path = ../../src/html/m_dflist.cpp; sourceTree = "<group>"; };
@@ -2544,6 +2553,7 @@
isa = PBXGroup;
children = (
8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */,
3116006345D833509865FF7F /* xh_bannerwindow.cpp */,
07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */,
8826A683573F35EA9789612C /* xh_bmpcbox.cpp */,
11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */,
@@ -2804,6 +2814,7 @@
isa = PBXGroup;
children = (
77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */,
36296C259D023EAAA240FC79 /* bannerwindow.cpp */,
13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */,
496674699F173A5385EAFF07 /* calctrlg.cpp */,
E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */,
@@ -2823,6 +2834,7 @@
917F2666B67E3D2EB84E74F8 /* sashwin.cpp */,
3F8836E29C5A370E80CE070E /* splash.cpp */,
B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */,
5190E3E110443FD29F2474FC /* treelist.cpp */,
8F08F70E1EF239999A4D2AC4 /* wizard.cpp */,
580AFC66F3003582B43043B1 /* animateg.cpp */,
);
@@ -4236,6 +4248,7 @@
7B4DA2F5F25B3E188CBAFE39 /* hyperlnkcmn.cpp in Sources */,
E6D18B2EDE353F67883085A0 /* odcombocmn.cpp in Sources */,
FEA741A9B6663A4C929893C3 /* aboutdlgg.cpp in Sources */,
E0FAB345D2933D42B62917A4 /* bannerwindow.cpp in Sources */,
B189DB62AE9F30A1B613756C /* bmpcboxg.cpp in Sources */,
2F50DBC14FE538A49823925B /* calctrlg.cpp in Sources */,
8A662992FFCB32E99D11950D /* commandlinkbuttong.cpp in Sources */,
@@ -4255,6 +4268,7 @@
3554C88010CE3D2A8970A136 /* sashwin.cpp in Sources */,
8AA341CCFB8E3F6AB3523596 /* splash.cpp in Sources */,
77BC918AF05C30E8A0BD27F9 /* tipdlg.cpp in Sources */,
060E095718B03EF98C75479A /* treelist.cpp in Sources */,
82FA4AA043213728AC266701 /* wizard.cpp in Sources */,
D00AF125FCB63A7A8F9B87DF /* taskbarcmn.cpp in Sources */,
46F341B46F80376B962759F6 /* animateg.cpp in Sources */,
@@ -4294,6 +4308,7 @@
2A7640E4210334AC93366901 /* winpars.cpp in Sources */,
87AA9C5D887B3C31A2AFB49E /* htmllbox.cpp in Sources */,
FBE4DB30865D3177B3A9993C /* xh_animatctrl.cpp in Sources */,
702616D38A5B345D9CC87115 /* xh_bannerwindow.cpp in Sources */,
94E510619F433AE3AC884756 /* xh_bmp.cpp in Sources */,
8966F77CC97B3ED780C8F138 /* xh_bmpcbox.cpp in Sources */,
84B3625464F732C3A79E1315 /* xh_bmpbt.cpp in Sources */,
@@ -5031,6 +5046,7 @@
7B4DA2F5F25B3E188CBAFE38 /* hyperlnkcmn.cpp in Sources */,
E6D18B2EDE353F678830859F /* odcombocmn.cpp in Sources */,
FEA741A9B6663A4C929893C2 /* aboutdlgg.cpp in Sources */,
E0FAB345D2933D42B62917A3 /* bannerwindow.cpp in Sources */,
B189DB62AE9F30A1B613756B /* bmpcboxg.cpp in Sources */,
2F50DBC14FE538A49823925A /* calctrlg.cpp in Sources */,
8A662992FFCB32E99D11950C /* commandlinkbuttong.cpp in Sources */,
@@ -5050,6 +5066,7 @@
3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */,
8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */,
77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */,
060E095718B03EF98C754799 /* treelist.cpp in Sources */,
82FA4AA043213728AC266700 /* wizard.cpp in Sources */,
D00AF125FCB63A7A8F9B87DE /* taskbarcmn.cpp in Sources */,
46F341B46F80376B962759F5 /* animateg.cpp in Sources */,
@@ -5089,6 +5106,7 @@
2A7640E4210334AC93366900 /* winpars.cpp in Sources */,
87AA9C5D887B3C31A2AFB49D /* htmllbox.cpp in Sources */,
FBE4DB30865D3177B3A9993B /* xh_animatctrl.cpp in Sources */,
702616D38A5B345D9CC87114 /* xh_bannerwindow.cpp in Sources */,
94E510619F433AE3AC884755 /* xh_bmp.cpp in Sources */,
8966F77CC97B3ED780C8F137 /* xh_bmpcbox.cpp in Sources */,
84B3625464F732C3A79E1314 /* xh_bmpbt.cpp in Sources */,

12
build/osx/wxiphone.xcodeproj/project.pbxproj
View File

@@ -26,6 +26,7 @@
056CA84179433AA48D55DA65 /* bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FDDE855D9F83E4891362EB4 /* bar.cpp */; };
056E30EA43753A7CB1AF8C9E /* strvararg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EEAD9C3E180305D8899441E /* strvararg.cpp */; };
05814571E7A83F5DBFB6E4C4 /* msgout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E968913A9A593B258BD8EACB /* msgout.cpp */; };
060E095718B03EF98C754799 /* treelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5190E3E110443FD29F2474FC /* treelist.cpp */; };
064908348009398C8EA8497C /* fontpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */; };
0654BCC3F0763C50A7949504 /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */; };
069D53F2DFBF370A8CC99630 /* LexCSS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */; };
@@ -341,6 +342,7 @@
6F8129E317EE3486A89D8548 /* LexSpecman.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */; };
6FA47EAACE613B039B6EC261 /* containr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3645350F572364BABF50238 /* containr.cpp */; };
700BBDECBE313E108BA99ABD /* toplvcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 861438BD294335D4B859EA71 /* toplvcmn.cpp */; };
702616D38A5B345D9CC87114 /* xh_bannerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3116006345D833509865FF7F /* xh_bannerwindow.cpp */; };
70F898F8B129380BBECAC559 /* richtexthtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */; };
7181709A030D3749AB355B74 /* xh_radbx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F43AF44465B335479752116D /* xh_radbx.cpp */; };
71CCB06E790C3C54BFF1199D /* LexSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */; };
@@ -668,6 +670,7 @@
DFEB8DA3D42734949CB1E1AA /* clipcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */; };
E05B06A7FEEE32D5AD87EA4F /* xh_editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05310A868F0B35999C568681 /* xh_editlbox.cpp */; };
E0E40333B61C33B58787078E /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */; };
E0FAB345D2933D42B62917A3 /* bannerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36296C259D023EAAA240FC79 /* bannerwindow.cpp */; };
E104017EE1A4357DAF84E1E6 /* auibook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A298576700C33F018616E7BD /* auibook.cpp */; };
E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */; };
E1F7C51F411B3AF39476E488 /* fdrepdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */; };
@@ -916,6 +919,7 @@
30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexGAP.cxx; path = ../../src/stc/scintilla/src/LexGAP.cxx; sourceTree = "<group>"; };
30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontcmn.cpp; path = ../../src/common/fontcmn.cpp; sourceTree = "<group>"; };
30FD1048328234E59D319863 /* tif_fax3.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_fax3.c; path = ../../src/tiff/libtiff/tif_fax3.c; sourceTree = "<group>"; };
3116006345D833509865FF7F /* xh_bannerwindow.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bannerwindow.cpp; path = ../../src/xrc/xh_bannerwindow.cpp; sourceTree = "<group>"; };
31F4B9B03D52339B8F82C114 /* variant.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = variant.cpp; path = ../../src/common/variant.cpp; sourceTree = "<group>"; };
326723AEB79A305F90D6B41D /* advprops.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = advprops.cpp; path = ../../src/propgrid/advprops.cpp; sourceTree = "<group>"; };
33CFE51FD6F0362092DF1A85 /* msgdlg.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = msgdlg.mm; path = ../../src/osx/iphone/msgdlg.mm; sourceTree = "<group>"; };
@@ -924,6 +928,7 @@
35007225BB683683AA7C5E48 /* glcanvas.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = glcanvas.mm; path = ../../src/osx/iphone/glcanvas.mm; sourceTree = "<group>"; };
3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSmalltalk.cxx; path = ../../src/stc/scintilla/src/LexSmalltalk.cxx; sourceTree = "<group>"; };
358D0A3AC73F322EA732D020 /* pngrutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrutil.c; path = ../../src/png/pngrutil.c; sourceTree = "<group>"; };
36296C259D023EAAA240FC79 /* bannerwindow.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bannerwindow.cpp; path = ../../src/generic/bannerwindow.cpp; sourceTree = "<group>"; };
36E1DBA275AD325DB759C180 /* fontenum.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontenum.cpp; path = ../../src/osx/core/fontenum.cpp; sourceTree = "<group>"; };
36F7955F8075343C8A9953DB /* LexPowerShell.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerShell.cxx; path = ../../src/stc/scintilla/src/LexPowerShell.cxx; sourceTree = "<group>"; };
3720038D64CF3C0B8F642A90 /* tokenzr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tokenzr.cpp; path = ../../src/common/tokenzr.cpp; sourceTree = "<group>"; };
@@ -995,6 +1000,7 @@
508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/src/LexSpecman.cxx; sourceTree = "<group>"; };
5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/src/LexLua.cxx; sourceTree = "<group>"; };
5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = "<group>"; };
5190E3E110443FD29F2474FC /* treelist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treelist.cpp; path = ../../src/generic/treelist.cpp; sourceTree = "<group>"; };
5219A792C6A736F193D4A82F /* ContractionState.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContractionState.cxx; path = ../../src/stc/scintilla/src/ContractionState.cxx; sourceTree = "<group>"; };
5248A45AB113341EAC361910 /* notebook_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = notebook_osx.cpp; path = ../../src/osx/notebook_osx.cpp; sourceTree = "<group>"; };
52FE1599218730CC99A3F801 /* m_dflist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_dflist.cpp; path = ../../src/html/m_dflist.cpp; sourceTree = "<group>"; };
@@ -1696,6 +1702,7 @@
isa = PBXGroup;
children = (
8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */,
3116006345D833509865FF7F /* xh_bannerwindow.cpp */,
07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */,
8826A683573F35EA9789612C /* xh_bmpcbox.cpp */,
11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */,
@@ -1965,6 +1972,7 @@
isa = PBXGroup;
children = (
77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */,
36296C259D023EAAA240FC79 /* bannerwindow.cpp */,
13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */,
496674699F173A5385EAFF07 /* calctrlg.cpp */,
E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */,
@@ -1984,6 +1992,7 @@
917F2666B67E3D2EB84E74F8 /* sashwin.cpp */,
3F8836E29C5A370E80CE070E /* splash.cpp */,
B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */,
5190E3E110443FD29F2474FC /* treelist.cpp */,
8F08F70E1EF239999A4D2AC4 /* wizard.cpp */,
580AFC66F3003582B43043B1 /* animateg.cpp */,
);
@@ -3303,6 +3312,7 @@
7B4DA2F5F25B3E188CBAFE38 /* hyperlnkcmn.cpp in Sources */,
E6D18B2EDE353F678830859F /* odcombocmn.cpp in Sources */,
FEA741A9B6663A4C929893C2 /* aboutdlgg.cpp in Sources */,
E0FAB345D2933D42B62917A3 /* bannerwindow.cpp in Sources */,
B189DB62AE9F30A1B613756B /* bmpcboxg.cpp in Sources */,
2F50DBC14FE538A49823925A /* calctrlg.cpp in Sources */,
8A662992FFCB32E99D11950C /* commandlinkbuttong.cpp in Sources */,
@@ -3322,6 +3332,7 @@
3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */,
8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */,
77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */,
060E095718B03EF98C754799 /* treelist.cpp in Sources */,
82FA4AA043213728AC266700 /* wizard.cpp in Sources */,
46F341B46F80376B962759F5 /* animateg.cpp in Sources */,
CE2C937117FE3AB599DD30B9 /* sound_osx.cpp in Sources */,
@@ -3354,6 +3365,7 @@
2A7640E4210334AC93366900 /* winpars.cpp in Sources */,
87AA9C5D887B3C31A2AFB49D /* htmllbox.cpp in Sources */,
FBE4DB30865D3177B3A9993B /* xh_animatctrl.cpp in Sources */,
702616D38A5B345D9CC87114 /* xh_bannerwindow.cpp in Sources */,
94E510619F433AE3AC884755 /* xh_bmp.cpp in Sources */,
8966F77CC97B3ED780C8F137 /* xh_bmpcbox.cpp in Sources */,
84B3625464F732C3A79E1314 /* xh_bmpbt.cpp in Sources */,

11
build/tools/build-wxwidgets.py
View File

@@ -174,6 +174,7 @@ def main(scriptName, args):
"mac_framework" : (False, "Install the Mac build as a framework"),
"mac_framework_prefix"
: (defFwPrefix, "Prefix where the framework should be installed. Default: %s" % defFwPrefix),
"cairo" : (False, "Enable dynamicly loading the Cairo lib for wxGraphicsContext on MSW"),
"no_config" : (False, "Turn off configure step on autoconf builds"),
"config_only" : (False, "Only run the configure step and then exit"),
"rebake" : (False, "Regenerate Bakefile and autoconf files"),
@@ -182,7 +183,6 @@ def main(scriptName, args):
"cocoa" : (False, "Build the old Mac Cooca port."),
"osx_cocoa" : (False, "Build the new Cocoa port"),
"shared" : (False, "Build wx as a dynamic library"),
"cairo" : (False, "Build support for wxCairoContext (always true on GTK+)"),
"extra_make" : ("", "Extra args to pass on [n]make's command line."),
"features" : ("", "A comma-separated list of wxUSE_XYZ defines on Win, or a list of configure flags on unix."),
"verbose" : (False, "Print commands as they are run, (to aid with debugging this script)"),
@@ -343,6 +343,8 @@ def main(scriptName, args):
flags["wxUSE_UNICODE_MSLU"] = "1"
if options.cairo:
if not os.environ.get("CAIRO_ROOT"):
print "WARNING: Expected CAIRO_ROOT set in the environment!"
flags["wxUSE_CAIRO"] = "1"
if options.wxpython:
@@ -361,7 +363,7 @@ def main(scriptName, args):
if VERSION >= (2,9):
flags["wxUSE_UIACTIONSIMULATOR"] = "1"
mswIncludeDir = os.path.join(wxRootDir, "include", "wx", "msw")
setup0File = os.path.join(mswIncludeDir, "setup0.h")
@@ -399,8 +401,11 @@ def main(scriptName, args):
if options.shared:
args.append("SHARED=1")
if options.cairo:
args.append("USE_CAIRO=1")
args.append(
"CPPFLAGS=/I%s" %
os.path.join(os.environ.get("CAIRO_ROOT", ""), 'include\\cairo'))
wxBuilder = builder.MSVCBuilder()