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

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

diff --git a/build/msw/config.gcc b/build/msw/config.gcc
index e35b9620a2c4dc53f00abefaaec5a60a1ab96f74..13ca82e9c0814eb01bd95623131057b791e29897 100644 (file)
--- a/build/msw/config.gcc
+++ b/build/msw/config.gcc
@@ -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


@@ -40,6 +40,12 @@ CPP ?= $(CC) -E
 # What type of library to build? [0,1]\r
 SHARED ?= 0\r
 \r
 # What type of library to build? [0,1]\r
 SHARED ?= 0\r
 \r

+# Used toolkit [MSW,GTK]
+TOOLKIT ?= MSW
+
+# GTK+ toolkit version [,2]
+TOOLKIT_VERSION ?=
+

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


@@ -71,6 +77,9 @@ USE_GUI ?= 1
 # Build wxHTML library (USE_GUI must be 1)? [0,1]\r
 USE_HTML ?= 1\r
 \r
 # Build wxHTML library (USE_GUI must be 1)? [0,1]\r
 USE_HTML ?= 1\r
 \r

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

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


@@ -110,9 +119,6 @@ USE_THREADS ?= 1
 # Enable wxCairoContext for platforms other than Linux/GTK. [0,1]\r
 USE_CAIRO ?= 0\r
 \r
 # Enable wxCairoContext for platforms other than Linux/GTK. [0,1]\r
 USE_CAIRO ?= 0\r
 \r

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

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