Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat
index 16cf399f725363b84a7483eb00fafc2e56094ab1..7586f887c3024799d6409eb86ff79f7e8ee614b5 100644 (file)
--- a/samples/printing/makefile.wat
+++ b/samples/printing/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\r
 #     This makefile was generated by\r

-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r

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


@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe\r
 \r

-$(OBJS)\printing.exe :  $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res\r
+$(OBJS)\printing.exe :  $(PRINTING_OBJECTS) $(OBJS)\printing_sample.res\r

        @%create $(OBJS)\printing.lbc\r
        @%append $(OBJS)\printing.lbc option quiet\r
        @%append $(OBJS)\printing.lbc name $^@\r
        @%create $(OBJS)\printing.lbc\r
        @%append $(OBJS)\printing.lbc option quiet\r
        @%append $(OBJS)\printing.lbc name $^@\r


@@ -256,13 +256,13 @@ $(OBJS)\printing.exe :  $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res
        @%append $(OBJS)\printing.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(PRINTING_OBJECTS)) do @%append $(OBJS)\printing.lbc file %i\r
        @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)  $(__CAIRO_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)\printing.lbc library %i\r
        @%append $(OBJS)\printing.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(PRINTING_OBJECTS)) do @%append $(OBJS)\printing.lbc file %i\r
        @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)  $(__CAIRO_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)\printing.lbc library %i\r

-       @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_printing.res\r
+       @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_sample.res\r

        @for %i in () do @%append $(OBJS)\printing.lbc option stack=%i\r
        wlink @$(OBJS)\printing.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\printing.lbc option stack=%i\r
        wlink @$(OBJS)\printing.lbc\r
 \r

+$(OBJS)\printing_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
+\r

 $(OBJS)\printing_printing.obj :  .AUTODEPEND .\printing.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(PRINTING_CXXFLAGS) $<\r
 \r
 $(OBJS)\printing_printing.obj :  .AUTODEPEND .\printing.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(PRINTING_CXXFLAGS) $<\r
 \r

-$(OBJS)\printing_printing.res :  .AUTODEPEND .\printing.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r