set correct EOL style for files added in r58024

[wxWidgets.git] / build / msw / makefile.wat

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 6527a430d989aef4f44d42ed758ea812d609b8fa..decbe7458b1e5cfaa07d6cd97e20f0a0c6c7b1a0 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -18,7 +18,11 @@
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
 !  loaddll wlink    wlink
+! endif
 !  loaddll wlib     wlibd
 !endif
 
@@ -730,12 +734,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_tipdlg.obj &
        $(OBJS)\monodll_wizard.obj &
        $(OBJS)\monodll_taskbarcmn.obj &
-       $(OBJS)\monodll_animateg.obj &
        $(OBJS)\monodll_aboutdlg.obj &
        $(OBJS)\monodll_notifmsg.obj &
        $(OBJS)\monodll_sound.obj &
        $(OBJS)\monodll_taskbar.obj &
        $(OBJS)\monodll_joystick.obj &
+       $(OBJS)\monodll_animateg.obj &
        $(OBJS)\monodll_bmpcbox.obj &
        $(OBJS)\monodll_calctrl.obj &
        $(OBJS)\monodll_datecontrols.obj &
@@ -769,7 +773,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_tipdlg.obj &
        $(OBJS)\monodll_wizard.obj &
        $(OBJS)\monodll_taskbarcmn.obj &
-       $(OBJS)\monodll_animateg.obj &
        $(OBJS)\monodll_aboutdlg.obj &
        $(OBJS)\monodll_notifmsg.obj &
        $(OBJS)\monodll_sound.obj &
@@ -1423,12 +1426,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_tipdlg.obj &
        $(OBJS)\monolib_wizard.obj &
        $(OBJS)\monolib_taskbarcmn.obj &
-       $(OBJS)\monolib_animateg.obj &
        $(OBJS)\monolib_aboutdlg.obj &
        $(OBJS)\monolib_notifmsg.obj &
        $(OBJS)\monolib_sound.obj &
        $(OBJS)\monolib_taskbar.obj &
        $(OBJS)\monolib_joystick.obj &
+       $(OBJS)\monolib_animateg.obj &
        $(OBJS)\monolib_bmpcbox.obj &
        $(OBJS)\monolib_calctrl.obj &
        $(OBJS)\monolib_datecontrols.obj &
@@ -1462,7 +1465,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_tipdlg.obj &
        $(OBJS)\monolib_wizard.obj &
        $(OBJS)\monolib_taskbarcmn.obj &
-       $(OBJS)\monolib_animateg.obj &
        $(OBJS)\monolib_aboutdlg.obj &
        $(OBJS)\monolib_notifmsg.obj &
        $(OBJS)\monolib_sound.obj &
@@ -2548,12 +2550,12 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_tipdlg.obj &
        $(OBJS)\advdll_wizard.obj &
        $(OBJS)\advdll_taskbarcmn.obj &
-       $(OBJS)\advdll_animateg.obj &
        $(OBJS)\advdll_aboutdlg.obj &
        $(OBJS)\advdll_notifmsg.obj &
        $(OBJS)\advdll_sound.obj &
        $(OBJS)\advdll_taskbar.obj &
        $(OBJS)\advdll_joystick.obj &
+       $(OBJS)\advdll_animateg.obj &
        $(OBJS)\advdll_bmpcbox.obj &
        $(OBJS)\advdll_calctrl.obj &
        $(OBJS)\advdll_datecontrols.obj &
@@ -2587,7 +2589,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_tipdlg.obj &
        $(OBJS)\advdll_wizard.obj &
        $(OBJS)\advdll_taskbarcmn.obj &
-       $(OBJS)\advdll_animateg.obj &
        $(OBJS)\advdll_aboutdlg.obj &
        $(OBJS)\advdll_notifmsg.obj &
        $(OBJS)\advdll_sound.obj &
@@ -2633,12 +2634,12 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_tipdlg.obj &
        $(OBJS)\advlib_wizard.obj &
        $(OBJS)\advlib_taskbarcmn.obj &
-       $(OBJS)\advlib_animateg.obj &
        $(OBJS)\advlib_aboutdlg.obj &
        $(OBJS)\advlib_notifmsg.obj &
        $(OBJS)\advlib_sound.obj &
        $(OBJS)\advlib_taskbar.obj &
        $(OBJS)\advlib_joystick.obj &
+       $(OBJS)\advlib_animateg.obj &
        $(OBJS)\advlib_bmpcbox.obj &
        $(OBJS)\advlib_calctrl.obj &
        $(OBJS)\advlib_datecontrols.obj &
@@ -2672,7 +2673,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_tipdlg.obj &
        $(OBJS)\advlib_wizard.obj &
        $(OBJS)\advlib_taskbarcmn.obj &
-       $(OBJS)\advlib_animateg.obj &
        $(OBJS)\advlib_aboutdlg.obj &
        $(OBJS)\advlib_notifmsg.obj &
        $(OBJS)\advlib_sound.obj &
@@ -3416,6 +3416,7 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_config.obj &
        $(OBJS)\monodll_convauto.obj &
        $(OBJS)\monodll_datetime.obj &
+       $(OBJS)\monodll_datetimefmt.obj &
        $(OBJS)\monodll_datstrm.obj &
        $(OBJS)\monodll_dircmn.obj &
        $(OBJS)\monodll_dynarray.obj &
@@ -3554,6 +3555,7 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_config.obj &
        $(OBJS)\monolib_convauto.obj &
        $(OBJS)\monolib_datetime.obj &
+       $(OBJS)\monolib_datetimefmt.obj &
        $(OBJS)\monolib_datstrm.obj &
        $(OBJS)\monolib_dircmn.obj &
        $(OBJS)\monolib_dynarray.obj &
@@ -3690,6 +3692,7 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_config.obj &
        $(OBJS)\basedll_convauto.obj &
        $(OBJS)\basedll_datetime.obj &
+       $(OBJS)\basedll_datetimefmt.obj &
        $(OBJS)\basedll_datstrm.obj &
        $(OBJS)\basedll_dircmn.obj &
        $(OBJS)\basedll_dynarray.obj &
@@ -3810,6 +3813,7 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_config.obj &
        $(OBJS)\baselib_convauto.obj &
        $(OBJS)\baselib_datetime.obj &
+       $(OBJS)\baselib_datetimefmt.obj &
        $(OBJS)\baselib_datstrm.obj &
        $(OBJS)\baselib_dircmn.obj &
        $(OBJS)\baselib_dynarray.obj &
@@ -5827,6 +5831,9 @@ $(OBJS)\monodll_convauto.obj :  .AUTODEPEND ..\..\src\common\convauto.cpp
 $(OBJS)\monodll_datetime.obj :  .AUTODEPEND ..\..\src\common\datetime.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_datetimefmt.obj :  .AUTODEPEND ..\..\src\common\datetimefmt.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_datstrm.obj :  .AUTODEPEND ..\..\src\common\datstrm.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -8088,18 +8095,6 @@ $(OBJS)\monodll_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-!ifeq WXUNIV 1
-$(OBJS)\monodll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monodll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8125,6 +8120,11 @@ $(OBJS)\monodll_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 $(OBJS)\monodll_version.res :  .AUTODEPEND ..\..\src\msw\version.rc
        wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS $<
 
@@ -8164,6 +8164,9 @@ $(OBJS)\monolib_convauto.obj :  .AUTODEPEND ..\..\src\common\convauto.cpp
 $(OBJS)\monolib_datetime.obj :  .AUTODEPEND ..\..\src\common\datetime.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_datetimefmt.obj :  .AUTODEPEND ..\..\src\common\datetimefmt.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_datstrm.obj :  .AUTODEPEND ..\..\src\common\datstrm.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -10425,18 +10428,6 @@ $(OBJS)\monolib_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-!ifeq WXUNIV 1
-$(OBJS)\monolib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monolib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -10462,6 +10453,11 @@ $(OBJS)\monolib_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 $(OBJS)\basedll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -10501,6 +10497,9 @@ $(OBJS)\basedll_convauto.obj :  .AUTODEPEND ..\..\src\common\convauto.cpp
 $(OBJS)\basedll_datetime.obj :  .AUTODEPEND ..\..\src\common\datetime.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
+$(OBJS)\basedll_datetimefmt.obj :  .AUTODEPEND ..\..\src\common\datetimefmt.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_datstrm.obj :  .AUTODEPEND ..\..\src\common\datstrm.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -10810,6 +10809,9 @@ $(OBJS)\baselib_convauto.obj :  .AUTODEPEND ..\..\src\common\convauto.cpp
 $(OBJS)\baselib_datetime.obj :  .AUTODEPEND ..\..\src\common\datetime.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
+$(OBJS)\baselib_datetimefmt.obj :  .AUTODEPEND ..\..\src\common\datetimefmt.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_datstrm.obj :  .AUTODEPEND ..\..\src\common\datstrm.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
@@ -14235,14 +14237,6 @@ $(OBJS)\advdll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
 $(OBJS)\advdll_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-!ifeq WXUNIV 1
-$(OBJS)\advdll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-!endif
-
 $(OBJS)\advdll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -14258,6 +14252,9 @@ $(OBJS)\advdll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
 $(OBJS)\advdll_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
+$(OBJS)\advdll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
@@ -14351,14 +14348,6 @@ $(OBJS)\advlib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
 $(OBJS)\advlib_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-!ifeq WXUNIV 1
-$(OBJS)\advlib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-!endif
-
 $(OBJS)\advlib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
@@ -14374,6 +14363,9 @@ $(OBJS)\advlib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
 $(OBJS)\advlib_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
+$(OBJS)\advlib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\mediadll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<