Small fixes to allow compilation in Unicode mode with gcc

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

diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index d1a50dca7e9d1800c7d75344825d91daab57fca0..227b0fccf6956e09c42882565c1c6f5c7fad6520 100644 (file)
--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -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.9 (http://bakefile.sourceforge.net)
+#     Beware that all changes made to this file will be overwritten next
+#     time you run Bakefile!
 # =========================================================================
 
 
@@ -9,21 +10,14 @@
 # These are configurable options:
 # -------------------------------------------------------------------------
 
-# Type of compiled binaries [debug,release]
-!ifndef BUILD
-BUILD = release
-!endif
-
 # C compiler 
 !ifndef CC
 CC = bcc32
 !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. 
-!ifndef CFG
-CFG = 
+# C++ compiler 
+!ifndef CXX
+CXX = bcc32
 !endif
 
 # Standard flags for CC 
@@ -31,32 +25,14 @@ CFG =
 CFLAGS = 
 !endif
 
-# Standard preprocessor flags (common for CC and CXX) 
-!ifndef CPPFLAGS
-CPPFLAGS = -a8 -g0
-!endif
-
-# C++ compiler 
-!ifndef CXX
-CXX = bcc32
-!endif
-
 # Standard flags for C++ 
 !ifndef CXXFLAGS
 CXXFLAGS = 
 !endif
 
-# 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]
-!ifndef DEBUG_FLAG
-DEBUG_FLAG = default
-!endif
-
-# 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]
-!ifndef DEBUG_INFO
-DEBUG_INFO = default
+# Standard preprocessor flags (common for CC and CXX) 
+!ifndef CPPFLAGS
+CPPFLAGS = -a8 -g0
 !endif
 
 # Standard linker flags 
@@ -64,9 +40,19 @@ DEBUG_INFO = default
 LDFLAGS = 
 !endif
 
-# Multiple libraries or single huge monolithic one? [0,1]
-!ifndef MONOLITHIC
-MONOLITHIC = 0
+# What type of library to build? [0,1]
+!ifndef SHARED
+SHARED = 0
+!endif
+
+# Build wxUniversal instead of native port? [0,1]
+!ifndef WXUNIV
+WXUNIV = 0
+!endif
+
+# Compile Unicode build of wxWidgets? [0,1]
+!ifndef UNICODE
+UNICODE = 0
 !endif
 
 # Use MSLU library when building Unicode version. [0,1]
@@ -74,26 +60,27 @@ MONOLITHIC = 0
 MSLU = 0
 !endif
 
-# Is this official build by wxWindows developers? [0,1]
-!ifndef OFFICIAL_BUILD
-OFFICIAL_BUILD = 0
+# Type of compiled binaries [debug,release]
+!ifndef BUILD
+BUILD = debug
 !endif
 
-# 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]
-!ifndef RUNTIME_LIBS
-RUNTIME_LIBS = dynamic
+# 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]
+!ifndef DEBUG_INFO
+DEBUG_INFO = default
 !endif
 
-# What type of library to build? [0,1]
-!ifndef SHARED
-SHARED = 1
+# 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]
+!ifndef DEBUG_FLAG
+DEBUG_FLAG = default
 !endif
 
-# Compile Unicode build of wxWindows? [0,1]
-!ifndef UNICODE
-UNICODE = 0
+# Multiple libraries or single huge monolithic one? [0,1]
+!ifndef MONOLITHIC
+MONOLITHIC = 0
 !endif
 
 # Build GUI libraries? [0,1]
@@ -106,9 +93,9 @@ USE_GUI = 1
 USE_HTML = 1
 !endif
 
-# Build ODBC database classes (USE_GUI must be 1)? [0,1]
-!ifndef USE_ODBC
-USE_ODBC = 0
+# 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]
@@ -116,13 +103,74 @@ USE_ODBC = 0
 USE_OPENGL = 0
 !endif
 
+# Build ODBC database classes (USE_GUI must be 1)? [0,1]
+!ifndef USE_ODBC
+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
+
+# 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
+
 # Use this to name your customized DLLs differently 
 !ifndef VENDOR
 VENDOR = custom
 !endif
 
-# Build wxUniversal instead of native port? [0,1]
-!ifndef WXUNIV
-WXUNIV = 0
+#  
+!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. 
+!ifndef CFG
+CFG = 
+!endif
+
+# 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. 
+!ifndef CPPUNIT_CFLAGS
+CPPUNIT_CFLAGS = 
+!endif
+
+# Linker flags needed to link test suite in tests directory. If you want
+# to run the tests, include CppUnit library here. 
+!ifndef CPPUNIT_LIBS
+CPPUNIT_LIBS = 
+!endif
+
+# 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]
+!ifndef RUNTIME_LIBS
+RUNTIME_LIBS = dynamic
 !endif