Add CombineURIs implementation for wxWebFileProtocolHandler. Update the IE backend...

[wxWidgets.git] / samples / makefile.wat

diff --git a/samples/makefile.wat b/samples/makefile.wat
index 46e56ed093247fb5d3ce85a4cdc11d3a9c927e46..fc70197e822351c237127a264c8a6b0c0ebf357a 100644 (file)
--- a/samples/makefile.wat
+++ b/samples/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\r
 #     This makefile was generated by\r

-#     Bakefile 0.2.8 (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
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r


@@ -45,16 +45,15 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        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
        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

-       USE_GDIPLUS="$(USE_GDIPLUS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &\r
-       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" &\r
-       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &\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)"\r
 \r
 \r
 ### Targets: ###\r
 \r
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &\r
        RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
 \r
 \r
 ### Targets: ###\r
 \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 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 widgets wizard wrapsizer xrc\r

 \r
 clean : .SYMBOLIC \r
        -if exist .\*.obj del .\*.obj\r
 \r
 clean : .SYMBOLIC \r
        -if exist .\*.obj del .\*.obj\r


@@ -275,6 +274,9 @@ clean : .SYMBOLIC
        cd typetest\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r
        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 validate\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
        cd $(WATCOM_CWD)\r


@@ -652,6 +654,11 @@ typetest : .SYMBOLIC
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
        cd $(WATCOM_CWD)\r
 \r
        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
 validate : .SYMBOLIC \r
        cd validate\r
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r