Rename src/generic/timectrl.cpp to timectrlg.cpp.
We can't use the same names for these files with VC6, it doesn't support this and the project can't be built because of the output object file names conflict. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -2289,7 +2289,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_richtooltipg.obj \
|
||||
$(OBJS)\monodll_sashwin.obj \
|
||||
$(OBJS)\monodll_splash.obj \
|
||||
$(OBJS)\monodll_generic_timectrl.obj \
|
||||
$(OBJS)\monodll_timectrlg.obj \
|
||||
$(OBJS)\monodll_tipdlg.obj \
|
||||
$(OBJS)\monodll_treelist.obj \
|
||||
$(OBJS)\monodll_wizard.obj \
|
||||
@@ -2308,7 +2308,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_datectrl.obj \
|
||||
$(OBJS)\monodll_datetimectrl.obj \
|
||||
$(OBJS)\monodll_hyperlink.obj \
|
||||
$(OBJS)\monodll_msw_timectrl.obj
|
||||
$(OBJS)\monodll_timectrl.obj
|
||||
!endif
|
||||
!if "$(WXUNIV)" == "1"
|
||||
____ADVANCED_SRC_FILENAMES_OBJECTS = \
|
||||
@@ -2341,7 +2341,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_richtooltipg.obj \
|
||||
$(OBJS)\monodll_sashwin.obj \
|
||||
$(OBJS)\monodll_splash.obj \
|
||||
$(OBJS)\monodll_generic_timectrl.obj \
|
||||
$(OBJS)\monodll_timectrlg.obj \
|
||||
$(OBJS)\monodll_tipdlg.obj \
|
||||
$(OBJS)\monodll_treelist.obj \
|
||||
$(OBJS)\monodll_wizard.obj \
|
||||
@@ -3072,7 +3072,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_richtooltipg.obj \
|
||||
$(OBJS)\monolib_sashwin.obj \
|
||||
$(OBJS)\monolib_splash.obj \
|
||||
$(OBJS)\monolib_generic_timectrl.obj \
|
||||
$(OBJS)\monolib_timectrlg.obj \
|
||||
$(OBJS)\monolib_tipdlg.obj \
|
||||
$(OBJS)\monolib_treelist.obj \
|
||||
$(OBJS)\monolib_wizard.obj \
|
||||
@@ -3091,7 +3091,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_datectrl.obj \
|
||||
$(OBJS)\monolib_datetimectrl.obj \
|
||||
$(OBJS)\monolib_hyperlink.obj \
|
||||
$(OBJS)\monolib_msw_timectrl.obj
|
||||
$(OBJS)\monolib_timectrl.obj
|
||||
!endif
|
||||
!if "$(WXUNIV)" == "1"
|
||||
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
|
||||
@@ -3124,7 +3124,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_richtooltipg.obj \
|
||||
$(OBJS)\monolib_sashwin.obj \
|
||||
$(OBJS)\monolib_splash.obj \
|
||||
$(OBJS)\monolib_generic_timectrl.obj \
|
||||
$(OBJS)\monolib_timectrlg.obj \
|
||||
$(OBJS)\monolib_tipdlg.obj \
|
||||
$(OBJS)\monolib_treelist.obj \
|
||||
$(OBJS)\monolib_wizard.obj \
|
||||
@@ -4290,7 +4290,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\advdll_richtooltipg.obj \
|
||||
$(OBJS)\advdll_sashwin.obj \
|
||||
$(OBJS)\advdll_splash.obj \
|
||||
$(OBJS)\advdll_generic_timectrl.obj \
|
||||
$(OBJS)\advdll_timectrlg.obj \
|
||||
$(OBJS)\advdll_tipdlg.obj \
|
||||
$(OBJS)\advdll_treelist.obj \
|
||||
$(OBJS)\advdll_wizard.obj \
|
||||
@@ -4309,7 +4309,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\advdll_datectrl.obj \
|
||||
$(OBJS)\advdll_datetimectrl.obj \
|
||||
$(OBJS)\advdll_hyperlink.obj \
|
||||
$(OBJS)\advdll_msw_timectrl.obj
|
||||
$(OBJS)\advdll_timectrl.obj
|
||||
!endif
|
||||
!if "$(WXUNIV)" == "1"
|
||||
____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
|
||||
@@ -4342,7 +4342,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\advdll_richtooltipg.obj \
|
||||
$(OBJS)\advdll_sashwin.obj \
|
||||
$(OBJS)\advdll_splash.obj \
|
||||
$(OBJS)\advdll_generic_timectrl.obj \
|
||||
$(OBJS)\advdll_timectrlg.obj \
|
||||
$(OBJS)\advdll_tipdlg.obj \
|
||||
$(OBJS)\advdll_treelist.obj \
|
||||
$(OBJS)\advdll_wizard.obj \
|
||||
@@ -4390,7 +4390,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\advlib_richtooltipg.obj \
|
||||
$(OBJS)\advlib_sashwin.obj \
|
||||
$(OBJS)\advlib_splash.obj \
|
||||
$(OBJS)\advlib_generic_timectrl.obj \
|
||||
$(OBJS)\advlib_timectrlg.obj \
|
||||
$(OBJS)\advlib_tipdlg.obj \
|
||||
$(OBJS)\advlib_treelist.obj \
|
||||
$(OBJS)\advlib_wizard.obj \
|
||||
@@ -4409,7 +4409,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\advlib_datectrl.obj \
|
||||
$(OBJS)\advlib_datetimectrl.obj \
|
||||
$(OBJS)\advlib_hyperlink.obj \
|
||||
$(OBJS)\advlib_msw_timectrl.obj
|
||||
$(OBJS)\advlib_timectrl.obj
|
||||
!endif
|
||||
!if "$(WXUNIV)" == "1"
|
||||
____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
|
||||
@@ -4442,7 +4442,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\advlib_richtooltipg.obj \
|
||||
$(OBJS)\advlib_sashwin.obj \
|
||||
$(OBJS)\advlib_splash.obj \
|
||||
$(OBJS)\advlib_generic_timectrl.obj \
|
||||
$(OBJS)\advlib_timectrlg.obj \
|
||||
$(OBJS)\advlib_tipdlg.obj \
|
||||
$(OBJS)\advlib_treelist.obj \
|
||||
$(OBJS)\advlib_wizard.obj \
|
||||
@@ -6751,7 +6751,7 @@ $(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
|
||||
$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
|
||||
|
||||
$(OBJS)\monodll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
|
||||
$(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
|
||||
|
||||
$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
|
||||
@@ -8392,8 +8392,8 @@ $(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
|
||||
$(OBJS)\monodll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
@@ -9156,7 +9156,7 @@ $(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
|
||||
$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
|
||||
|
||||
$(OBJS)\monolib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
|
||||
$(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
|
||||
|
||||
$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
|
||||
@@ -10797,8 +10797,8 @@ $(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
|
||||
$(OBJS)\monolib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
@@ -14464,7 +14464,7 @@ $(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
|
||||
$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
|
||||
|
||||
$(OBJS)\advdll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
|
||||
$(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
|
||||
|
||||
$(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
|
||||
@@ -14554,8 +14554,8 @@ $(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
|
||||
$(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp
|
||||
|
||||
$(OBJS)\advdll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
|
||||
$(OBJS)\advdll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
|
||||
|
||||
$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
|
||||
@@ -14614,7 +14614,7 @@ $(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
|
||||
$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
|
||||
|
||||
$(OBJS)\advlib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
|
||||
$(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
|
||||
|
||||
$(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
|
||||
@@ -14704,8 +14704,8 @@ $(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
|
||||
$(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
|
||||
|
||||
$(OBJS)\advlib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
|
||||
$(OBJS)\advlib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp
|
||||
|
||||
$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
|
||||
|
||||
Reference in New Issue
Block a user