don't output -DwxUSE_GUI=0 in cflags by default, do output it if 'base' is specified...

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

diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat
index edb462e3af6a5873f3ed310281ef2e684285509c..1c54cf7930d8d0ca5f648a89cff6fb7acbf23096 100644 (file)
--- a/samples/widgets/makefile.wat
+++ b/samples/widgets/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)

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


@@ -224,7 +224,7 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 27
+WX_RELEASE_NODOT = 29

 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)


@@ -254,6 +254,7 @@ WIDGETS_OBJECTS =  &
        $(OBJS)\widgets_notebook.obj &
        $(OBJS)\widgets_odcombobox.obj &
        $(OBJS)\widgets_radiobox.obj &
        $(OBJS)\widgets_notebook.obj &
        $(OBJS)\widgets_odcombobox.obj &
        $(OBJS)\widgets_radiobox.obj &

+       $(OBJS)\widgets_searchctrl.obj &

        $(OBJS)\widgets_slider.obj &
        $(OBJS)\widgets_spinbtn.obj &
        $(OBJS)\widgets_static.obj &
        $(OBJS)\widgets_slider.obj &
        $(OBJS)\widgets_spinbtn.obj &
        $(OBJS)\widgets_static.obj &


@@ -338,6 +339,9 @@ $(OBJS)\widgets_odcombobox.obj :  .AUTODEPEND .\odcombobox.cpp
 $(OBJS)\widgets_radiobox.obj :  .AUTODEPEND .\radiobox.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
 $(OBJS)\widgets_radiobox.obj :  .AUTODEPEND .\radiobox.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 

+$(OBJS)\widgets_searchctrl.obj :  .AUTODEPEND .\searchctrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+

 $(OBJS)\widgets_slider.obj :  .AUTODEPEND .\slider.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
 $(OBJS)\widgets_slider.obj :  .AUTODEPEND .\slider.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<