Include wx/containr.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/samples/opengl/makefile.vc b/samples/opengl/makefile.vc
index 43f11bfb7faa1a705438dd16b185cbf0059abf28..8bb2f66bd0caff63efbc7f2117c45cf6c40e9dbf 100644 (file)
--- a/samples/opengl/makefile.vc
+++ b/samples/opengl/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)

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


@@ -13,13 +13,16 @@
 ### Variables: ###
 
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 ### Variables: ###
 
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \

-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \

        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \

-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
-       DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" MONOLITHIC="$(MONOLITHIC)" \
-       USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_OPENGL="$(USE_OPENGL)" \
-       USE_ODBC="$(USE_ODBC)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" CFG="$(CFG)" \
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
+       USE_QA="$(USE_QA)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
+       USE_RTTI="$(USE_RTTI)" USE_THREADS="$(USE_THREADS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" 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)"
 
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
        RUNTIME_LIBS="$(RUNTIME_LIBS)"
 


@@ -34,6 +37,7 @@ all: sub_cube sub_isosurf sub_penguin
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res

+       -if exist .\*.pch del .\*.pch

        cd cube
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd $(MAKEDIR)
        cd cube
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd $(MAKEDIR)


@@ -58,3 +62,4 @@ sub_penguin:
        cd penguin
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
        cd penguin
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)

+