For wxGTK2, link with X11 explicitly, since we use many X11 functions directly.

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 7ca2de6c8d91ef385bb3080297d29b9dab276bbe..cbad8220c8cc5115a6555357553e980a40ed534c 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
-#     Bakefile 0.2.6 (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
@@ -24,7 +24,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
        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_GDIPLUS="$(USE_GDIPLUS)" \\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
@@ -36,7 +36,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 \r
 ### Targets: ###\r
 \r
-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\r
+all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dll 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 uiaction validate vscroll widgets wizard wrapsizer xrc\r
 \r
 clean: \r
        -if exist .\*.o del .\*.o\r
@@ -57,6 +57,7 @@ clean:
        $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C display -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C dll -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C docview -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) clean\r
@@ -111,6 +112,7 @@ clean:
        $(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C uiaction -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean\r
        $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean\r
@@ -167,6 +169,9 @@ dialup:
 display: \r
        $(MAKE) -C display -f makefile.gcc $(MAKEARGS) all\r
 \r
+dll: \r
+       $(MAKE) -C dll -f makefile.gcc $(MAKEARGS) all\r
+\r
 dnd: \r
        $(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) all\r
 \r
@@ -329,6 +334,9 @@ treectrl:
 typetest: \r
        $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) all\r
 \r
+uiaction: \r
+       $(MAKE) -C uiaction -f makefile.gcc $(MAKEARGS) all\r
+\r
 validate: \r
        $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) all\r
 \r
@@ -351,13 +359,13 @@ memcheck:
        $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all\r
 \r
 .PHONY: all clean access animate artprov aui calendar caret clipboard collpane combo \\r
-       config console controls dataview dialogs dialup display dnd docview dragimag \\r
+       config console controls dataview dialogs dialup display dll dnd docview dragimag \\r
        drawing erase event except exec font grid help htlbox html image internat ipc joytest \\r
        keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \\r
        opengl ownerdrw popup power printing propgrid regtest render ribbon richtext \\r
        sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder \\r
-       taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard \\r
-       wrapsizer xrc memcheck\r
+       taskbar text thread toolbar treectrl typetest uiaction validate vscroll widgets \\r
+       wizard wrapsizer xrc memcheck\r
 \r
 \r
 SHELL := $(COMSPEC)\r