Compilation fix to propgrid sample after r74628.

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

diff --git a/samples/opengl/makefile.vc b/samples/opengl/makefile.vc
index 02a60936560bd16d31a841aecc9fc884fd465545..bef0e38ad2f8bf9acccc994d376bd33827a247e5 100644 (file)
--- a/samples/opengl/makefile.vc
+++ b/samples/opengl/makefile.vc
@@ -1,68 +1,69 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### 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_RIBBON="$(USE_RIBBON)" 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: ###
-
-
-
-### Targets: ###
-
-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)"
-
-sub_cube: 
-       cd cube
-       $(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)"
-
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r
+#     Do not modify, all changes will be overwritten!\r
+# =========================================================================\r
+\r
+!include <../../build/msw/config.vc>\r
+\r
+# -------------------------------------------------------------------------\r
+# Do not modify the rest of this file!\r
+# -------------------------------------------------------------------------\r
+\r
+### Variables: ###\r
+\r
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r
+       TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \\r
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\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_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
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
+\r
+### Conditionally set variables: ###\r
+\r
+\r
+\r
+### Targets: ###\r
+\r
+all: sub_cube sub_isosurf sub_penguin\r
+\r
+clean: \r
+       -if exist .\*.obj del .\*.obj\r
+       -if exist .\*.res del .\*.res\r
+       -if exist .\*.pch del .\*.pch\r
+       cd cube\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
+       cd isosurf\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
+       cd penguin\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
+\r
+sub_cube: \r
+       cd cube\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r
+sub_isosurf: \r
+       cd isosurf\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r
+sub_penguin: \r
+       cd penguin\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r