Fix handling of help buttons with non-empty label under OS X.

[wxWidgets.git] / demos / makefile.gcc

diff --git a/demos/makefile.gcc b/demos/makefile.gcc
index 92eb5c9763b8c2a6924467b624f8b7e806783ca4..6e333d2d94d31c0fc26600f263c2257125bfc2e6 100644 (file)
--- a/demos/makefile.gcc
+++ b/demos/makefile.gcc
@@ -1,70 +1,71 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
-       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
-       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \
-       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
-       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
-       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
-       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
-
-### Conditionally set variables: ###
-
-
-
-### Targets: ###
-
-all: bombs forty fractal life poem
-
-clean: 
-       -if exist .\*.o del .\*.o
-       -if exist .\*.d del .\*.d
-       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) clean
-       $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) clean
-       $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) clean
-       $(MAKE) -C life -f makefile.gcc $(MAKEARGS) clean
-       $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) clean
-
-bombs: 
-       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) all
-
-forty: 
-       $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) all
-
-fractal: 
-       $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) all
-
-life: 
-       $(MAKE) -C life -f makefile.gcc $(MAKEARGS) all
-
-poem: 
-       $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) all
-
-.PHONY: all clean bombs forty fractal life poem
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include ./*.d
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Do not modify, all changes will be overwritten!\r
+# =========================================================================\r
+\r
+include ../build/msw/config.gcc\r
+\r
+# -------------------------------------------------------------------------\r
+# Do not modify the rest of this file!\r
+# -------------------------------------------------------------------------\r
+\r
+### Variables: ###\r
+\r
+MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \\r
+       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \\r
+       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \\r
+       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \\r
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \\r
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
+       USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \\r
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"\r
+\r
+### Conditionally set variables: ###\r
+\r
+\r
+\r
+### Targets: ###\r
+\r
+all: bombs forty fractal life poem\r
+\r
+clean: \r
+       -if exist .\*.o del .\*.o\r
+       -if exist .\*.d del .\*.d\r
+       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C life -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) clean\r
+\r
+bombs: \r
+       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) all\r
+\r
+forty: \r
+       $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) all\r
+\r
+fractal: \r
+       $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) all\r
+\r
+life: \r
+       $(MAKE) -C life -f makefile.gcc $(MAKEARGS) all\r
+\r
+poem: \r
+       $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) all\r
+\r
+.PHONY: all clean bombs forty fractal life poem\r
+\r
+\r
+SHELL := $(COMSPEC)\r
+\r
+# Dependencies tracking:\r
+-include ./*.d\r