Unix compilation fixes after last commit

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

diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index aefa3f3cddfbe514bb3df50925772e6715d695b8..499851f1fe8e368966c78763fa810280dcadef66 100644 (file)
--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -1,7 +1,8 @@
 # =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.3 (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!
 # =========================================================================
 
 
@@ -39,6 +40,11 @@ CPPFLAGS = -a8 -g0
 LDFLAGS = 
 !endif
 
+# The C preprocessor 
+!ifndef CPP
+CPP = cpp32 -Sr -oCON
+!endif
+
 # What type of library to build? [0,1]
 !ifndef SHARED
 SHARED = 0
@@ -49,7 +55,7 @@ SHARED = 0
 WXUNIV = 0
 !endif
 
-# Compile Unicode build of wxWindows? [0,1]
+# Compile Unicode build of wxWidgets? [0,1]
 !ifndef UNICODE
 UNICODE = 0
 !endif
@@ -92,6 +98,16 @@ USE_GUI = 1
 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 OpenGL canvas library (USE_GUI must be 1)? [0,1]
 !ifndef USE_OPENGL
 USE_OPENGL = 0
@@ -102,12 +118,27 @@ USE_OPENGL = 0
 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
 !endif
 
-# Is this official build by wxWindows developers? [0,1]
+# Enable run-time type information (RTTI) in compiled code. [0,1]
+!ifndef USE_RTTI
+USE_RTTI = 1
+!endif
+
+# Enable threading in compiled code. [0,1]
+!ifndef USE_THREADS
+USE_THREADS = 1
+!endif
+
+# Is this official build by wxWidgets developers? [0,1]
 !ifndef OFFICIAL_BUILD
 OFFICIAL_BUILD = 0
 !endif
@@ -117,6 +148,16 @@ OFFICIAL_BUILD = 0
 VENDOR = custom
 !endif
 
+#  
+!ifndef WX_FLAVOUR
+WX_FLAVOUR = 
+!endif
+
+#  
+!ifndef WX_LIB_FLAVOUR
+WX_LIB_FLAVOUR = 
+!endif
+
 # 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.