use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

[wxWidgets.git] / samples / opengl / makefile.wat

diff --git a/samples/opengl/makefile.wat b/samples/opengl/makefile.wat
index 34cb581cdff8424907ed3b42401e7b3b0e490025..481d985a3e5c8b4f537891d96a035fb693b4c220 100644 (file)
--- a/samples/opengl/makefile.wat
+++ b/samples/opengl/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)

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


@@ -35,9 +35,12 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &

-       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" &
+       USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" &

        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &

-       VENDOR="$(VENDOR)" CFG="$(CFG)" RUNTIME_LIBS="$(RUNTIME_LIBS)"
+       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)"

 
 
 ### Targets: ###
 
 
 ### Targets: ###


@@ -49,6 +52,16 @@ clean : .SYMBOLIC
        -if exist .\*.res del .\*.res
        -if exist .\*.lbc del .\*.lbc
        -if exist .\*.ilk del .\*.ilk
        -if exist .\*.res del .\*.res
        -if exist .\*.lbc del .\*.lbc
        -if exist .\*.ilk del .\*.ilk

+       -if exist .\*.pch del .\*.pch
+       cd cube
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd isosurf
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd penguin
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)

 
 cube : .SYMBOLIC 
        cd cube
 
 cube : .SYMBOLIC 
        cd cube


@@ -64,3 +77,4 @@ penguin : .SYMBOLIC
        cd penguin
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
        cd penguin
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)

+