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

Rebake MSW makefiles properly after wxQt merge.

Browse Source 
Somehow the makefiles contained references to a non-existing
src/common/textdlg.cpp, fix this by rebaking them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-08-25 17:47:44 +00:00
parent 6283e4e6f1
commit f01e6a7efd
3 changed files with 168 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
build/msw/makefile.bcc
View File

@@ -1986,7 +1986,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_textdlg.obj \
$(OBJS)\monodll_textentrycmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
@@ -2028,8 +2027,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_srchctlg.obj \
$(OBJS)\monodll_statbmpg.obj \
$(OBJS)\monodll_stattextg.obj \
$(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_toolbkg.obj \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
$(OBJS)\monodll_vscroll.obj \
@@ -2260,7 +2261,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_textdlg.obj \
$(OBJS)\monodll_textentrycmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
@@ -2302,8 +2302,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_srchctlg.obj \
$(OBJS)\monodll_statbmpg.obj \
$(OBJS)\monodll_stattextg.obj \
$(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_toolbkg.obj \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
$(OBJS)\monodll_vscroll.obj \
@@ -2792,7 +2794,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_textdlg.obj \
$(OBJS)\monolib_textentrycmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
@@ -2834,8 +2835,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_srchctlg.obj \
$(OBJS)\monolib_statbmpg.obj \
$(OBJS)\monolib_stattextg.obj \
$(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_toolbkg.obj \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
$(OBJS)\monolib_vscroll.obj \
@@ -3066,7 +3069,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_textdlg.obj \
$(OBJS)\monolib_textentrycmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
@@ -3108,8 +3110,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_srchctlg.obj \
$(OBJS)\monolib_statbmpg.obj \
$(OBJS)\monolib_stattextg.obj \
$(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_toolbkg.obj \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
$(OBJS)\monolib_vscroll.obj \
@@ -3474,7 +3478,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_textdlg.obj \
$(OBJS)\coredll_textentrycmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
@@ -3516,8 +3519,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_srchctlg.obj \
$(OBJS)\coredll_statbmpg.obj \
$(OBJS)\coredll_stattextg.obj \
$(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_toolbkg.obj \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
$(OBJS)\coredll_vscroll.obj \
@@ -3748,7 +3753,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_textdlg.obj \
$(OBJS)\coredll_textentrycmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
@@ -3790,8 +3794,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_srchctlg.obj \
$(OBJS)\coredll_statbmpg.obj \
$(OBJS)\coredll_stattextg.obj \
$(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_toolbkg.obj \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
$(OBJS)\coredll_vscroll.obj \
@@ -4032,7 +4038,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_textdlg.obj \
$(OBJS)\corelib_textentrycmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
@@ -4074,8 +4079,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_srchctlg.obj \
$(OBJS)\corelib_statbmpg.obj \
$(OBJS)\corelib_stattextg.obj \
$(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_toolbkg.obj \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
$(OBJS)\corelib_vscroll.obj \
@@ -4306,7 +4313,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_textdlg.obj \
$(OBJS)\corelib_textentrycmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
@@ -4348,8 +4354,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_srchctlg.obj \
$(OBJS)\corelib_statbmpg.obj \
$(OBJS)\corelib_stattextg.obj \
$(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_toolbkg.obj \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
$(OBJS)\corelib_vscroll.obj \
@@ -8260,11 +8268,6 @@ $(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textdlg.obj: ..\..\src\common\textdlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -8470,6 +8473,11 @@ $(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -8480,6 +8488,11 @@ $(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -10726,11 +10739,6 @@ $(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textdlg.obj: ..\..\src\common\textdlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -10936,6 +10944,11 @@ $(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -10946,6 +10959,11 @@ $(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -13138,11 +13156,6 @@ $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textdlg.obj: ..\..\src\common\textdlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -13348,6 +13361,11 @@ $(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -13358,6 +13376,11 @@ $(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -14580,11 +14603,6 @@ $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textdlg.obj: ..\..\src\common\textdlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -14790,6 +14808,11 @@ $(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -14800,6 +14823,11 @@ $(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp