more attempts to fix CppUnit::assertEquals for VC6 without breaking everything else

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

diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index 6fa7687c876fc7dad926a1fc51b1f289ee7c1c94..2e33a0a73189732048633484b65b8aae12007590 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.5 (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!
 # =========================================================================


@@ -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


@@ -52,7 +57,7 @@ WXUNIV = 0
 
 # Compile Unicode build of wxWidgets? [0,1]
 !ifndef UNICODE
 
 # Compile Unicode build of wxWidgets? [0,1]
 !ifndef UNICODE

-UNICODE = 0
+UNICODE = 1

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


@@ -93,19 +98,44 @@ 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
 !endif
 
 # Build wxXRC library (USE_GUI must be 1)? [0,1]
 !ifndef USE_XRC
 USE_XRC = 1
 !endif
 

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

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

-# Build ODBC database classes (USE_GUI must be 1)? [0,1]
-!ifndef USE_ODBC
-USE_ODBC = 0
+# 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]
 !endif
 
 # Enable exceptions in compiled code. [0,1]


@@ -123,6 +153,11 @@ USE_RTTI = 1
 USE_THREADS = 1
 !endif
 
 USE_THREADS = 1
 !endif
 

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

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