fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

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

diff --git a/build/msw/config.vc b/build/msw/config.vc
index d1e48b232ca93114f6f300f6b9614b9275f3adcc..a18b147958be921d270326ba078a46a79978bf38 100644 (file)
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -1,7 +1,8 @@
 # =========================================================================
 # =========================================================================

-#     This makefile was generated by
-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
+#     This configuration file was generated by
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Beware that all changes made to this file will be overwritten next
+#     time you run Bakefile!

 # =========================================================================
 
 
 # =========================================================================
 
 


@@ -27,13 +28,16 @@ CPPFLAGS =
 # Standard linker flags 
 LDFLAGS = 
 
 # Standard linker flags 
 LDFLAGS = 
 

+# The C preprocessor 
+CPP = $(CC) /EP /nologo
+

 # What type of library to build? [0,1]
 SHARED = 0
 
 # Build wxUniversal instead of native port? [0,1]
 WXUNIV = 0
 
 # What type of library to build? [0,1]
 SHARED = 0
 
 # Build wxUniversal instead of native port? [0,1]
 WXUNIV = 0
 

-# Compile Unicode build of wxWindows? [0,1]
+# Compile Unicode build of wxWidgets? [0,1]

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


@@ -42,6 +46,15 @@ MSLU = 0
 # Type of compiled binaries [debug,release]
 BUILD = debug
 
 # Type of compiled binaries [debug,release]
 BUILD = debug
 

+# The target processor architecture must be specified when it is not X86.
+# 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.
+# 
+# Accepted values: AMD64, IA64. 
+TARGET_CPU = $(CPU)
+

 # 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]
 # 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]


@@ -52,7 +65,7 @@ DEBUG_INFO = default
 DEBUG_FLAG = default
 
 # Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
 DEBUG_FLAG = default
 
 # Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?

-# Acts according to DEBUG_INFO by default. [0,1,default]
+# Acts according to BUILD by default. [0,1,default]

 DEBUG_RUNTIME_LIBS = default
 
 # Multiple libraries or single huge monolithic one? [0,1]
 DEBUG_RUNTIME_LIBS = default
 
 # Multiple libraries or single huge monolithic one? [0,1]


@@ -64,26 +77,55 @@ USE_GUI = 1
 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1
 
 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1
 

+# Build multimedia library (USE_GUI must be 1)? [0,1]
+USE_MEDIA = 1
+
+# 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 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
+

 # Enable exceptions in compiled code. [0,1]
 USE_EXCEPTIONS = 1
 
 # Enable exceptions in compiled code. [0,1]
 USE_EXCEPTIONS = 1
 

-# Is this official build by wxWindows developers? [0,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
 
 OFFICIAL_BUILD = 0
 
 # Use this to name your customized DLLs differently 
 VENDOR = custom
 

+#  
+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 = 
 
 # 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]
 # 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]