Fix discrepancy between different ways of measuring text extents under Mac.

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 9fb4596f7bfdc8bc4de7c9a1763e86541d4bb3c6..e52eadc1ad388774874391aef4c0802d752e064d 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.4 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)

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


@@ -20,8 +20,9 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
        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)" \
        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_RIBBON="$(USE_RIBBON)" 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)" \
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \


@@ -35,7 +36,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer
+all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc

 
 clean: 
        -if exist .\*.o del .\*.o
 
 clean: 
        -if exist .\*.o del .\*.o


@@ -46,9 +47,10 @@ clean:
        $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) clean

+       $(MAKE) -C clipboard -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C config -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) clean

+       $(MAKE) -C config -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C console -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C console -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) clean


@@ -61,8 +63,8 @@ clean:
        $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C event -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C event -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C except -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C except -f makefile.gcc $(MAKEARGS) clean

+       $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C font -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C font -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean


@@ -79,21 +81,21 @@ clean:
        $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C mobile -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean

+       $(MAKE) -C power -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C render -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C render -f makefile.gcc $(MAKEARGS) clean

+       $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C scrollsub -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) clean


@@ -101,6 +103,8 @@ clean:
        $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) clean

+       $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C text -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C thread -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C text -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C thread -f makefile.gcc $(MAKEARGS) clean


@@ -112,7 +116,7 @@ clean:
        $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean
 
 access: 
        $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean
 
 access: 


@@ -133,15 +137,18 @@ calendar:
 caret: 
        $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) all
 
 caret: 
        $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) all
 

+clipboard: 
+       $(MAKE) -C clipboard -f makefile.gcc $(MAKEARGS) all
+

 collpane: 
        $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) all
 
 collpane: 
        $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) all
 

-config: 
-       $(MAKE) -C config -f makefile.gcc $(MAKEARGS) all
-

 combo: 
        $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) all
 
 combo: 
        $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) all
 

+config: 
+       $(MAKE) -C config -f makefile.gcc $(MAKEARGS) all
+

 console: 
        $(MAKE) -C console -f makefile.gcc $(MAKEARGS) all
 
 console: 
        $(MAKE) -C console -f makefile.gcc $(MAKEARGS) all
 


@@ -178,12 +185,12 @@ erase:
 event: 
        $(MAKE) -C event -f makefile.gcc $(MAKEARGS) all
 
 event: 
        $(MAKE) -C event -f makefile.gcc $(MAKEARGS) all
 

-exec: 
-       $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all
-

 except: 
        $(MAKE) -C except -f makefile.gcc $(MAKEARGS) all
 
 except: 
        $(MAKE) -C except -f makefile.gcc $(MAKEARGS) all
 

+exec: 
+       $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all
+

 font: 
        $(MAKE) -C font -f makefile.gcc $(MAKEARGS) all
 
 font: 
        $(MAKE) -C font -f makefile.gcc $(MAKEARGS) all
 


@@ -232,9 +239,6 @@ menu:
 minimal: 
        $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) all
 
 minimal: 
        $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) all
 

-mobile: 
-       $(MAKE) -C mobile -f makefile.gcc $(MAKEARGS) all
-

 nativdlg: 
        $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) all
 
 nativdlg: 
        $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) all
 


@@ -253,6 +257,9 @@ ownerdrw:
 popup: 
        $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) all
 
 popup: 
        $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) all
 

+power: 
+       $(MAKE) -C power -f makefile.gcc $(MAKEARGS) all
+

 printing: 
        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
 
 printing: 
        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
 


@@ -265,6 +272,9 @@ regtest:
 render: 
        $(MAKE) -C render -f makefile.gcc $(MAKEARGS) all
 
 render: 
        $(MAKE) -C render -f makefile.gcc $(MAKEARGS) all
 

+ribbon: 
+       $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) all
+

 richtext: 
        $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all
 
 richtext: 
        $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all
 


@@ -274,9 +284,6 @@ sashtest:
 scroll: 
        $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) all
 
 scroll: 
        $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) all
 

-scrollsub: 
-       $(MAKE) -C scrollsub -f makefile.gcc $(MAKEARGS) all
-

 shaped: 
        $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) all
 
 shaped: 
        $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) all
 


@@ -298,6 +305,12 @@ statbar:
 stc: 
        $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) all
 
 stc: 
        $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) all
 

+svg: 
+       $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) all
+
+taborder: 
+       $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) all
+

 taskbar: 
        $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) all
 
 taskbar: 
        $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) all
 


@@ -331,20 +344,20 @@ wizard:
 wrapsizer: 
        $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all
 
 wrapsizer: 
        $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all
 

-mfc: 
-       $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
+xrc: 
+       $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) all

 
 memcheck: 
        $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all
 
 
 memcheck: 
        $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all
 

-.PHONY: all clean access animate artprov aui calendar caret collpane config combo \
-       console controls dataview dialogs dialup display dnd docview dragimag drawing \
-       erase event exec except font grid help htlbox html image internat ipc joytest \
-       keyboard layout listctrl mdi mediaplayer menu minimal mobile nativdlg notebook \
-       oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest \
-       scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text \
-       thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc \
-       memcheck
+.PHONY: all clean access animate artprov aui calendar caret clipboard collpane combo \
+       config console controls dataview dialogs dialup display dnd docview dragimag \
+       drawing erase event except exec font grid help htlbox html image internat ipc joytest \
+       keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \
+       opengl ownerdrw popup power printing propgrid regtest render ribbon richtext \
+       sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder \
+       taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard \
+       wrapsizer xrc memcheck

 
 
 SHELL := $(COMSPEC)
 
 
 SHELL := $(COMSPEC)