Applied patch [ 1183157 ] Compilation with GCC 4.0

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

diff --git a/build/msw/config.vc b/build/msw/config.vc
index aee32e402535da37838af84b2315247d6609d32e..9307be3469f78677840e798ed3ab5276043882ac 100644 (file)
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -1,7 +1,8 @@
 # =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
+#     This configuration file was generated by
+#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Beware that all changes made to this file will be overwritten next
+#     time you run Bakefile!
 # =========================================================================
 
 
@@ -9,77 +10,109 @@
 # These are configurable options:
 # -------------------------------------------------------------------------
 
-# Type of compiled binaries [debug,release]
-BUILD = release
-
 # C compiler 
 CC = cl
 
-# Name of your custom configuration. This affects directory
-# where object files are stored as well as the location of
-# compiled .lib files and setup.h under the lib/ toplevel directory. 
-CFG = 
+# C++ compiler 
+CXX = cl
 
 # Standard flags for CC 
 CFLAGS = 
 
+# Standard flags for C++ 
+CXXFLAGS = 
+
 # Standard preprocessor flags (common for CC and CXX) 
 CPPFLAGS = 
 
-# C++ compiler 
-CXX = cl
+# Standard linker flags 
+LDFLAGS = 
 
-# Standard flags for C++ 
-CXXFLAGS = 
+# What type of library to build? [0,1]
+SHARED = 0
 
-# Should __WXDEBUG__ be defined? The default value "default" means that it will
-# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
-DEBUG_FLAG = default
+# Build wxUniversal instead of native port? [0,1]
+WXUNIV = 0
+
+# Compile Unicode build of wxWidgets? [0,1]
+UNICODE = 0
+
+# Use MSLU library when building Unicode version. [0,1]
+MSLU = 0
+
+# Type of compiled binaries [debug,release]
+BUILD = debug
 
 # Should debugging info be included in the executables? The default value
 # "default" means that debug info will be included if BUILD=debug
 # and not included if BUILD=release. [0,1,default]
 DEBUG_INFO = default
 
+# Should __WXDEBUG__ be defined? The default value "default" means that it will
+# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
+DEBUG_FLAG = default
+
 # Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
 # Acts according to DEBUG_INFO by default. [0,1,default]
 DEBUG_RUNTIME_LIBS = default
 
-# Standard linker flags 
-LDFLAGS = 
-
 # Multiple libraries or single huge monolithic one? [0,1]
 MONOLITHIC = 0
 
-# Is this official build by wxWindows developers? [0,1]
-OFFICIAL_BUILD = 0
-
-# Version of C runtime library to use. You can change this to
-# static if SHARED=0, but it is highly recommended to not do
-# it if SHARED=1 unless you know what you are doing. [dynamic,static]
-RUNTIME_LIBS = dynamic
-
-# What type of library to build? [0,1]
-SHARED = 1
-
-# Compile Unicode build of wxWindows? [0,1]
-UNICODE = 0
-
 # Build GUI libraries? [0,1]
 USE_GUI = 1
 
 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1
 
-# Build ODBC database classes (USE_GUI must be 1)? [0,1]
-USE_ODBC = 0
+# Build wxXRC library (USE_GUI must be 1)? [0,1]
+USE_XRC = 1
 
 # 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 = 0
+
+# Enable exceptions in compiled code. [0,1]
+USE_EXCEPTIONS = 1
+
+# Enable run-time type information (RTTI) in compiled code. [0,1]
+USE_RTTI = 1
+
+# Enable threading in compiled code. [0,1]
+USE_THREADS = 1
+
+# Is this official build by wxWidgets developers? [0,1]
+OFFICIAL_BUILD = 0
+
 # Use this to name your customized DLLs differently 
 VENDOR = custom
 
-# Build wxUniversal instead of native port? [0,1]
-WXUNIV = 0
+#  
+WX_FLAVOUR = 
+
+#  
+WX_LIB_FLAVOUR = 
+
+# Name of your custom configuration. This affects directory
+# where object files are stored as well as the location of
+# compiled .lib files and setup.h under the lib/ toplevel directory. 
+CFG = 
+
+# Compiler flags needed to compile test suite in tests directory. If you want
+# to run the tests, set it so that the compiler can find CppUnit headers. 
+CPPUNIT_CFLAGS = 
+
+# Linker flags needed to link test suite in tests directory. If you want
+# to run the tests, include CppUnit library here. 
+CPPUNIT_LIBS = 
+
+# Version of C runtime library to use. You can change this to
+# static if SHARED=0, but it is highly recommended to not do
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]
+RUNTIME_LIBS = dynamic