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

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

diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index 6fa7687c876fc7dad926a1fc51b1f289ee7c1c94..499851f1fe8e368966c78763fa810280dcadef66 100644 (file)
--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
 # =========================================================================
 #     This configuration file was generated by

-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)

 #     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!
 # =========================================================================


@@ -40,6 +40,11 @@ CPPFLAGS = -a8 -g0
 LDFLAGS = 
 !endif
 
 LDFLAGS = 
 !endif
 

+# The C preprocessor 
+!ifndef CPP
+CPP = cpp32 -Sr -oCON
+!endif
+

 # What type of library to build? [0,1]
 !ifndef SHARED
 SHARED = 0
 # What type of library to build? [0,1]
 !ifndef SHARED
 SHARED = 0


@@ -93,6 +98,11 @@ USE_GUI = 1
 USE_HTML = 1
 !endif
 
 USE_HTML = 1
 !endif
 

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

 # Build wxXRC library (USE_GUI must be 1)? [0,1]
 !ifndef USE_XRC
 USE_XRC = 1
 # Build wxXRC library (USE_GUI must be 1)? [0,1]
 !ifndef USE_XRC
 USE_XRC = 1


@@ -108,6 +118,11 @@ USE_OPENGL = 0
 USE_ODBC = 0
 !endif
 
 USE_ODBC = 0
 !endif
 

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

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