use different strings for wchar_t and UTF-8-based Unicode builds

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

diff --git a/build/msw/config.vc b/build/msw/config.vc
index ce90f1558c0a5aaffe6da42532dff4d346e03ae3..53fae08ef5775c195a6caa10e125d5ac43b403a4 100644 (file)
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
 # =========================================================================
 #     This configuration file was generated by

-#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)

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


@@ -38,7 +38,7 @@ SHARED = 0
 WXUNIV = 0
 
 # Compile Unicode build of wxWidgets? [0,1]
 WXUNIV = 0
 
 # Compile Unicode build of wxWidgets? [0,1]

-UNICODE = 0
+UNICODE = 1

 
 # Use MSLU library when building Unicode version. [0,1]
 MSLU = 0
 
 # Use MSLU library when building Unicode version. [0,1]
 MSLU = 0


@@ -50,7 +50,9 @@ BUILD = debug
 # This does not affect the compiler output, so you still need to make sure
 # your environment is set up appropriately with the correct compiler in the
 # PATH. Rather it affects some options passed to some of the common build
 # This does not affect the compiler output, so you still need to make sure
 # your environment is set up appropriately with the correct compiler in the
 # PATH. Rather it affects some options passed to some of the common build

-# utilities such as the resource compiler and the linker. [AMD64,IA64]
+# utilities such as the resource compiler and the linker.
+# 
+# Accepted values: AMD64, IA64. 

 TARGET_CPU = $(CPU)
 
 # Should debugging info be included in the executables? The default value
 TARGET_CPU = $(CPU)
 
 # Should debugging info be included in the executables? The default value


@@ -81,12 +83,18 @@ USE_MEDIA = 1
 # Build wxXRC library (USE_GUI must be 1)? [0,1]
 USE_XRC = 1
 
 # Build wxXRC library (USE_GUI must be 1)? [0,1]
 USE_XRC = 1
 

+# Build wxAUI library (USE_GUI must be 1)? [0,1]
+USE_AUI = 1
+
+# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
+USE_RICHTEXT = 1
+
+# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
+USE_STC = 1
+

 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 

-# Build ODBC database classes (USE_GUI must be 1)? [0,1]
-USE_ODBC = 0
-

 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA = 1
 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA = 1
 


@@ -99,6 +107,9 @@ USE_RTTI = 1
 # Enable threading in compiled code. [0,1]
 USE_THREADS = 1
 
 # Enable threading in compiled code. [0,1]
 USE_THREADS = 1
 

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

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