Don't include Common-Controls manifest in wxBase apps.

[wxWidgets.git] / build / msw / config.bcc

diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index c0e43a75ce09073ea21ef7bbb809c9a51a118930..21d8a76d7be75259c3209d1c2e3f0db5dac34b3e 100644 (file)
--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This configuration file was generated by\r
 # =========================================================================\r
 #     This configuration file was generated by\r

-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r

 #     Beware that all changes made to this file will be overwritten next\r
 #     time you run Bakefile!\r
 # =========================================================================\r
 #     Beware that all changes made to this file will be overwritten next\r
 #     time you run Bakefile!\r
 # =========================================================================\r


@@ -50,6 +50,16 @@ CPP = cpp32 -Sr -oCON
 SHARED = 0\r
 !endif\r
 \r
 SHARED = 0\r
 !endif\r
 \r

+# Used toolkit [MSW,GTK]
+!ifndef TOOLKIT
+TOOLKIT = MSW
+!endif
+
+# GTK+ toolkit version [,2]
+!ifndef TOOLKIT_VERSION
+TOOLKIT_VERSION =
+!endif
+

 # Build wxUniversal instead of native port? [0,1]\r
 !ifndef WXUNIV\r
 WXUNIV = 0\r
 # Build wxUniversal instead of native port? [0,1]\r
 !ifndef WXUNIV\r
 WXUNIV = 0\r


@@ -99,6 +109,11 @@ USE_GUI = 1
 USE_HTML = 1\r
 !endif\r
 \r
 USE_HTML = 1\r
 !endif\r
 \r

+# Build wxWebView library (USE_GUI must be 1)? [0,1]\r
+!ifndef USE_WEBVIEW\r
+USE_WEBVIEW = 1\r
+!endif\r
+\r

 # Build multimedia library (USE_GUI must be 1)? [0,1]\r
 !ifndef USE_MEDIA\r
 USE_MEDIA = 1\r
 # Build multimedia library (USE_GUI must be 1)? [0,1]\r
 !ifndef USE_MEDIA\r
 USE_MEDIA = 1\r


@@ -164,11 +179,6 @@ USE_THREADS = 1
 USE_CAIRO = 0\r
 !endif\r
 \r
 USE_CAIRO = 0\r
 !endif\r
 \r

-# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]\r
-!ifndef USE_GDIPLUS\r
-USE_GDIPLUS = 0\r
-!endif\r
-\r

 # Is this official build by wxWidgets developers? [0,1]\r
 !ifndef OFFICIAL_BUILD\r
 OFFICIAL_BUILD = 0\r
 # Is this official build by wxWidgets developers? [0,1]\r
 !ifndef OFFICIAL_BUILD\r
 OFFICIAL_BUILD = 0\r