fixing infinite recursion for rotated text, introduced in cleanup r57915

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

diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat
index 5c1bf32f473d26478ac1890c4e1c2081410c10a6..1d148bfe4645a6b72b1d1369a422a962d750cef4 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.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.5 (http://www.bakefile.org)

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


@@ -138,6 +138,11 @@ __EXCEPTIONSFLAG_8 =
 !ifeq USE_EXCEPTIONS 1
 __EXCEPTIONSFLAG_8 = -xs
 !endif
 !ifeq USE_EXCEPTIONS 1
 __EXCEPTIONSFLAG_8 = -xs
 !endif

+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif

 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &


@@ -165,6 +170,10 @@ __LIB_PNG_p =
 !ifeq USE_GUI 1
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif
 !ifeq USE_GUI 1
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif

+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif

 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__


@@ -191,9 +200,16 @@ __THREAD_DEFINE_p =
 __THREAD_DEFINE_p = -dwxNO_THREADS
 !endif
 __UNICODE_DEFINE_p =
 __THREAD_DEFINE_p = -dwxNO_THREADS
 !endif
 __UNICODE_DEFINE_p =

+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif

 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif

+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif

 __DLLFLAG_p =
 !ifeq SHARED 1
 __DLLFLAG_p = -dWXUSINGDLL
 __DLLFLAG_p =
 !ifeq SHARED 1
 __DLLFLAG_p = -dWXUSINGDLL


@@ -201,30 +217,47 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat

 OBJS = &
 OBJS = &

-       wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WIDGETS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
        $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WIDGETS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
        $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
-       -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-       $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)

 WIDGETS_OBJECTS =  &
 WIDGETS_OBJECTS =  &

+       $(OBJS)\widgets_bmpcombobox.obj &

        $(OBJS)\widgets_button.obj &
        $(OBJS)\widgets_checkbox.obj &
        $(OBJS)\widgets_button.obj &
        $(OBJS)\widgets_checkbox.obj &

+       $(OBJS)\widgets_choice.obj &
+       $(OBJS)\widgets_clrpicker.obj &

        $(OBJS)\widgets_combobox.obj &
        $(OBJS)\widgets_combobox.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_gauge.obj &

+       $(OBJS)\widgets_hyperlnk.obj &
+       $(OBJS)\widgets_itemcontainer.obj &

        $(OBJS)\widgets_listbox.obj &
        $(OBJS)\widgets_notebook.obj &
        $(OBJS)\widgets_listbox.obj &
        $(OBJS)\widgets_notebook.obj &

+       $(OBJS)\widgets_odcombobox.obj &

        $(OBJS)\widgets_radiobox.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 &

+       $(OBJS)\widgets_statbmp.obj &

        $(OBJS)\widgets_textctrl.obj &
        $(OBJS)\widgets_textctrl.obj &

+       $(OBJS)\widgets_toggle.obj &

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


@@ -244,53 +277,99 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
        -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe
 
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
        -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe
 

-$(OBJS)\widgets.exe :  $(WIDGETS_OBJECTS) $(OBJS)\widgets_widgets.res
+$(OBJS)\widgets.exe :  $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res

        @%create $(OBJS)\widgets.lbc
        @%append $(OBJS)\widgets.lbc option quiet
        @%append $(OBJS)\widgets.lbc name $^@
        @%append $(OBJS)\widgets.lbc option caseexact
        @%create $(OBJS)\widgets.lbc
        @%append $(OBJS)\widgets.lbc option quiet
        @%append $(OBJS)\widgets.lbc name $^@
        @%append $(OBJS)\widgets.lbc option caseexact

-       @%append $(OBJS)\widgets.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\widgets.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)

        @for %i in ($(WIDGETS_OBJECTS)) do @%append $(OBJS)\widgets.lbc file %i
        @for %i in ($(WIDGETS_OBJECTS)) do @%append $(OBJS)\widgets.lbc file %i

-       @for %i in ( $(__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)  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 ) do @%append $(OBJS)\widgets.lbc library %i
-       @%append $(OBJS)\widgets.lbc option resource=$(OBJS)\widgets_widgets.res
+       @for %i in ( $(__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)  $(__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 wininet.lib) do @%append $(OBJS)\widgets.lbc library %i
+       @%append $(OBJS)\widgets.lbc option resource=$(OBJS)\widgets_sample.res
+       @for %i in () do @%append $(OBJS)\widgets.lbc option stack=%i

        wlink @$(OBJS)\widgets.lbc
 
        wlink @$(OBJS)\widgets.lbc
 

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

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

-       $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<

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

-       $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_choice.obj :  .AUTODEPEND .\choice.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_clrpicker.obj :  .AUTODEPEND .\clrpicker.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<

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

-       $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_datepick.obj :  .AUTODEPEND .\datepick.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_dirctrl.obj :  .AUTODEPEND .\dirctrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_dirpicker.obj :  .AUTODEPEND .\dirpicker.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_filectrl.obj :  .AUTODEPEND .\filectrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_filepicker.obj :  .AUTODEPEND .\filepicker.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_fontpicker.obj :  .AUTODEPEND .\fontpicker.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<

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

-       $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_hyperlnk.obj :  .AUTODEPEND .\hyperlnk.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_itemcontainer.obj :  .AUTODEPEND .\itemcontainer.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<

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

-       $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<

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

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

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

-       $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+       $(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
 
 $(OBJS)\widgets_slider.obj :  .AUTODEPEND .\slider.cpp

-       $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<

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

-       $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<

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

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

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

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

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

-       $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<

 
 

-$(OBJS)\widgets_widgets.res :  .AUTODEPEND .\widgets.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) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+$(OBJS)\widgets_sample.res :  .AUTODEPEND .\..\sample.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 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<