use wxFlexGridSizer correctly (fixes #10294)

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

diff --git a/samples/opengl/makefile.vc b/samples/opengl/makefile.vc
index c8861af3b2647121e39591c72fe009187e264a3a..44ba17f3cc6385ed8ea858e867880a1175109330 100644 (file)
--- a/samples/opengl/makefile.vc
+++ b/samples/opengl/makefile.vc
@@ -1,10 +1,10 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.5 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include <../../build/config.vc>
+!include <../../build/msw/config.vc>
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -12,6 +12,21 @@
 
 ### Variables: ###
 
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       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_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       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)"
 
 ### Conditionally set variables: ###
 
@@ -19,13 +34,34 @@
 
 ### Targets: ###
 
-all: cube
+all: sub_cube sub_isosurf sub_penguin
 
 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 isosurf
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd penguin
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
 
-cube: 
+sub_cube: 
        cd cube
-       $(MAKE) /$(MAKEFLAGS) all
-       cd $(MAKEDIR)
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_isosurf: 
+       cd isosurf
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_penguin: 
+       cd penguin
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+