#undef CreateFont to fix cygwin compilation now that wxRichTextCtrl uses it

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

diff --git a/samples/multimon/makefile.wat b/samples/multimon/makefile.wat
index e7efa701b20982bc291f27cbdc5f53e9c873ed0a..f498c7e838b1ac3c5f0629e1c83e00e37bdbd1e6 100644 (file)
--- a/samples/multimon/makefile.wat
+++ b/samples/multimon/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.1.9 (http://bakefile.sourceforge.net)

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


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

-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 27

 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)


@@ -246,8 +246,8 @@ $(OBJS)\multimon_test.exe :  $(MULTIMON_TEST_OBJECTS) $(OBJS)\multimon_test_samp
        wlink @$(OBJS)\multimon_test.lbc
 
 $(OBJS)\multimon_test_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
        wlink @$(OBJS)\multimon_test.lbc
 
 $(OBJS)\multimon_test_sample.res :  .AUTODEPEND .\..\..\samples\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) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
+       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 $<

 
 $(OBJS)\multimon_test_multimon_test.obj :  .AUTODEPEND .\multimon_test.cpp
 
 $(OBJS)\multimon_test_multimon_test.obj :  .AUTODEPEND .\multimon_test.cpp

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