Update files.bkl to match the changes Stefan made to Makefile.in earlier, to update...

[wxWidgets.git] / samples / widgets / makefile.vc

diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc
index bebfdcf199e1c78f587e122a8dd368729cd4f10e..02bce0484ea5f067c2763348258d83f84844e2f8 100644 (file)
--- a/samples/widgets/makefile.vc
+++ b/samples/widgets/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -38,6 +38,7 @@ WIDGETS_OBJECTS =  \
        $(OBJS)\widgets_datepick.obj \
        $(OBJS)\widgets_dirctrl.obj \
        $(OBJS)\widgets_dirpicker.obj \
        $(OBJS)\widgets_datepick.obj \
        $(OBJS)\widgets_dirctrl.obj \
        $(OBJS)\widgets_dirpicker.obj \

+       $(OBJS)\widgets_filectrl.obj \

        $(OBJS)\widgets_filepicker.obj \
        $(OBJS)\widgets_fontpicker.obj \
        $(OBJS)\widgets_gauge.obj \
        $(OBJS)\widgets_filepicker.obj \
        $(OBJS)\widgets_fontpicker.obj \
        $(OBJS)\widgets_gauge.obj \


@@ -51,6 +52,7 @@ WIDGETS_OBJECTS =  \
        $(OBJS)\widgets_slider.obj \
        $(OBJS)\widgets_spinbtn.obj \
        $(OBJS)\widgets_static.obj \
        $(OBJS)\widgets_slider.obj \
        $(OBJS)\widgets_spinbtn.obj \
        $(OBJS)\widgets_static.obj \

+       $(OBJS)\widgets_statbmp.obj \

        $(OBJS)\widgets_textctrl.obj \
        $(OBJS)\widgets_toggle.obj \
        $(OBJS)\widgets_widgets.obj \
        $(OBJS)\widgets_textctrl.obj \
        $(OBJS)\widgets_toggle.obj \
        $(OBJS)\widgets_widgets.obj \


@@ -253,9 +255,15 @@ __THREAD_DEFINE_p = /DwxNO_THREADS
 !if "$(USE_THREADS)" == "0"
 __THREAD_DEFINE_p_1 = /d wxNO_THREADS
 !endif
 !if "$(USE_THREADS)" == "0"
 __THREAD_DEFINE_p_1 = /d wxNO_THREADS
 !endif

+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif

 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /D_UNICODE
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /D_UNICODE
 !endif

+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif

 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d _UNICODE
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d _UNICODE
 !endif


@@ -278,18 +286,10 @@ __DLLFLAG_p = /DWXUSINGDLL
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"

-__WXLIB_XML_p = \
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"

 __WXLIB_ADV_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_ADV_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 !endif
 !if "$(MONOLITHIC)" == "0"

-__WXLIB_HTML_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"

 __WXLIB_CORE_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif
 __WXLIB_CORE_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif


@@ -335,85 +335,91 @@ clean:
        -if exist $(OBJS)\widgets.pdb del $(OBJS)\widgets.pdb
 
 $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res
        -if exist $(OBJS)\widgets.pdb del $(OBJS)\widgets.pdb
 
 $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res

-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-       $(WIDGETS_OBJECTS)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
+       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\widgets.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       $(WIDGETS_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib

 <<
 
 $(OBJS)\widgets_bmpcombobox.obj: .\bmpcombobox.cpp
 <<
 
 $(OBJS)\widgets_bmpcombobox.obj: .\bmpcombobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\bmpcombobox.cpp

 
 $(OBJS)\widgets_button.obj: .\button.cpp
 
 $(OBJS)\widgets_button.obj: .\button.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\button.cpp

 
 $(OBJS)\widgets_checkbox.obj: .\checkbox.cpp
 
 $(OBJS)\widgets_checkbox.obj: .\checkbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\checkbox.cpp

 
 $(OBJS)\widgets_choice.obj: .\choice.cpp
 
 $(OBJS)\widgets_choice.obj: .\choice.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\choice.cpp

 
 $(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp
 
 $(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\clrpicker.cpp

 
 $(OBJS)\widgets_combobox.obj: .\combobox.cpp
 
 $(OBJS)\widgets_combobox.obj: .\combobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\combobox.cpp

 
 $(OBJS)\widgets_datepick.obj: .\datepick.cpp
 
 $(OBJS)\widgets_datepick.obj: .\datepick.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\datepick.cpp

 
 $(OBJS)\widgets_dirctrl.obj: .\dirctrl.cpp
 
 $(OBJS)\widgets_dirctrl.obj: .\dirctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\dirctrl.cpp

 
 $(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp
 
 $(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\dirpicker.cpp
+
+$(OBJS)\widgets_filectrl.obj: .\filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\filectrl.cpp

 
 $(OBJS)\widgets_filepicker.obj: .\filepicker.cpp
 
 $(OBJS)\widgets_filepicker.obj: .\filepicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\filepicker.cpp

 
 $(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp
 
 $(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\fontpicker.cpp

 
 $(OBJS)\widgets_gauge.obj: .\gauge.cpp
 
 $(OBJS)\widgets_gauge.obj: .\gauge.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\gauge.cpp

 
 $(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp
 
 $(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\hyperlnk.cpp

 
 $(OBJS)\widgets_itemcontainer.obj: .\itemcontainer.cpp
 
 $(OBJS)\widgets_itemcontainer.obj: .\itemcontainer.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\itemcontainer.cpp

 
 $(OBJS)\widgets_listbox.obj: .\listbox.cpp
 
 $(OBJS)\widgets_listbox.obj: .\listbox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\listbox.cpp

 
 $(OBJS)\widgets_notebook.obj: .\notebook.cpp
 
 $(OBJS)\widgets_notebook.obj: .\notebook.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\notebook.cpp

 
 $(OBJS)\widgets_odcombobox.obj: .\odcombobox.cpp
 
 $(OBJS)\widgets_odcombobox.obj: .\odcombobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\odcombobox.cpp

 
 $(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
 
 $(OBJS)\widgets_radiobox.obj: .\radiobox.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\radiobox.cpp

 
 $(OBJS)\widgets_searchctrl.obj: .\searchctrl.cpp
 
 $(OBJS)\widgets_searchctrl.obj: .\searchctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\searchctrl.cpp

 
 $(OBJS)\widgets_slider.obj: .\slider.cpp
 
 $(OBJS)\widgets_slider.obj: .\slider.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\slider.cpp

 
 $(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp
 
 $(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\spinbtn.cpp

 
 $(OBJS)\widgets_static.obj: .\static.cpp
 
 $(OBJS)\widgets_static.obj: .\static.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\static.cpp
+
+$(OBJS)\widgets_statbmp.obj: .\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\statbmp.cpp

 
 $(OBJS)\widgets_textctrl.obj: .\textctrl.cpp
 
 $(OBJS)\widgets_textctrl.obj: .\textctrl.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\textctrl.cpp

 
 $(OBJS)\widgets_toggle.obj: .\toggle.cpp
 
 $(OBJS)\widgets_toggle.obj: .\toggle.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\toggle.cpp

 
 $(OBJS)\widgets_widgets.obj: .\widgets.cpp
 
 $(OBJS)\widgets_widgets.obj: .\widgets.cpp

-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\widgets.cpp

 
 $(OBJS)\widgets_sample.res: .\..\sample.rc
 
 $(OBJS)\widgets_sample.res: .\..\sample.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc