Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.

[wxWidgets.git] / samples / makefile.wat

diff --git a/samples/makefile.wat b/samples/makefile.wat
index 25d3fdebeb627565a78cfbb07d394dfbd4a4a9eb..b477d18061e82933931c5472127b424a0b2d1d49 100644 (file)
--- a/samples/makefile.wat
+++ b/samples/makefile.wat
@@ -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
@@ -39,12 +39,12 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" 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_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" &\r
+       USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" &\r
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" &\r
+       USE_STC="$(USE_STC)" 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
@@ -53,7 +53,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
 \r
 ### Targets: ###\r
 \r
-all : .SYMBOLIC 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 : .SYMBOLIC 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 webview widgets wizard wrapsizer xrc\r
 \r
 clean : .SYMBOLIC \r
        -if exist .\*.obj del .\*.obj\r
@@ -109,6 +109,9 @@ clean : .SYMBOLIC
        cd display\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r
+       cd dll\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
+       cd $(WATCOM_CWD)\r
        cd dnd\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r
@@ -271,12 +274,18 @@ clean : .SYMBOLIC
        cd typetest\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r
+       cd uiaction\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
+       cd $(WATCOM_CWD)\r
        cd validate\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r
        cd vscroll\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r
+       cd webview\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
+       cd $(WATCOM_CWD)\r
        cd widgets\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r
@@ -373,6 +382,11 @@ display : .SYMBOLIC
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
        cd $(WATCOM_CWD)\r
 \r
+dll : .SYMBOLIC \r
+       cd dll\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
+       cd $(WATCOM_CWD)\r
+\r
 dnd : .SYMBOLIC \r
        cd dnd\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
@@ -643,6 +657,11 @@ typetest : .SYMBOLIC
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
        cd $(WATCOM_CWD)\r
 \r
+uiaction : .SYMBOLIC \r
+       cd uiaction\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
+       cd $(WATCOM_CWD)\r
+\r
 validate : .SYMBOLIC \r
        cd validate\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
@@ -653,6 +672,11 @@ vscroll : .SYMBOLIC
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
        cd $(WATCOM_CWD)\r
 \r
+webview : .SYMBOLIC \r
+       cd webview\r
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
+       cd $(WATCOM_CWD)\r
+\r
 widgets : .SYMBOLIC \r
        cd widgets\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r