Patch 950002 after agreement from Markus Sinner

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

diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index 4990a1d099b9429d374eedad5aad8ddcfa388b9f..aefa3f3cddfbe514bb3df50925772e6715d695b8 100644 (file)
--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -9,21 +9,14 @@
 # These are configurable options:
 # -------------------------------------------------------------------------
 
 # These are configurable options:
 # -------------------------------------------------------------------------
 

-# Type of compiled binaries [debug,release]
-!ifndef BUILD
-BUILD = release
-!endif
-

 # C compiler 
 !ifndef CC
 CC = bcc32
 !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 
 !endif
 
 # Standard flags for CC 


@@ -31,25 +24,44 @@ CFG =
 CFLAGS = 
 !endif
 
 CFLAGS = 
 !endif
 

+# Standard flags for C++ 
+!ifndef CXXFLAGS
+CXXFLAGS = 
+!endif
+

 # Standard preprocessor flags (common for CC and CXX) 
 !ifndef CPPFLAGS
 # Standard preprocessor flags (common for CC and CXX) 
 !ifndef CPPFLAGS

-CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include
+CPPFLAGS = -a8 -g0

 !endif
 
 !endif
 

-# C++ compiler 
-!ifndef CXX
-CXX = bcc32
+# Standard linker flags 
+!ifndef LDFLAGS
+LDFLAGS = 

 !endif
 
 !endif
 

-# Standard flags for C++ 
-!ifndef CXXFLAGS
-CXXFLAGS = 
+# What type of library to build? [0,1]
+!ifndef SHARED
+SHARED = 0

 !endif
 
 !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
+# Build wxUniversal instead of native port? [0,1]
+!ifndef WXUNIV
+WXUNIV = 0
+!endif
+
+# Compile Unicode build of wxWindows? [0,1]
+!ifndef UNICODE
+UNICODE = 0
+!endif
+
+# Use MSLU library when building Unicode version. [0,1]
+!ifndef MSLU
+MSLU = 0
+!endif
+
+# Type of compiled binaries [debug,release]
+!ifndef BUILD
+BUILD = debug

 !endif
 
 # Should debugging info be included in the executables? The default value
 !endif
 
 # Should debugging info be included in the executables? The default value


@@ -59,9 +71,10 @@ DEBUG_FLAG = default
 DEBUG_INFO = default
 !endif
 
 DEBUG_INFO = default
 !endif
 

-# Standard linker flags 
-!ifndef LDFLAGS
-LDFLAGS = -L$(BCCDIR)\lib
+# 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
 
 # Multiple libraries or single huge monolithic one? [0,1]
 !endif
 
 # Multiple libraries or single huge monolithic one? [0,1]


@@ -69,28 +82,6 @@ LDFLAGS = -L$(BCCDIR)\lib
 MONOLITHIC = 0
 !endif
 
 MONOLITHIC = 0
 !endif
 

-# Is this official build by wxWindows developers? [0,1]
-!ifndef OFFICIAL_BUILD
-OFFICIAL_BUILD = 0
-!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
-
-# What type of library to build? [0,1]
-!ifndef SHARED
-SHARED = 1
-!endif
-
-# Compile Unicode build of wxWindows? [0,1]
-!ifndef UNICODE
-UNICODE = 0
-!endif
-

 # Build GUI libraries? [0,1]
 !ifndef USE_GUI
 USE_GUI = 1
 # Build GUI libraries? [0,1]
 !ifndef USE_GUI
 USE_GUI = 1


@@ -101,14 +92,24 @@ USE_GUI = 1
 USE_HTML = 1
 !endif
 
 USE_HTML = 1
 !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
 !endif
 
 # Build ODBC database classes (USE_GUI must be 1)? [0,1]
 !ifndef USE_ODBC
 USE_ODBC = 0
 !endif
 

-# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
-!ifndef USE_OPENGL
-USE_OPENGL = 0
+# Enable exceptions in compiled code. [0,1]
+!ifndef USE_EXCEPTIONS
+USE_EXCEPTIONS = 1
+!endif
+
+# Is this official build by wxWindows developers? [0,1]
+!ifndef OFFICIAL_BUILD
+OFFICIAL_BUILD = 0

 !endif
 
 # Use this to name your customized DLLs differently 
 !endif
 
 # Use this to name your customized DLLs differently 


@@ -116,8 +117,29 @@ USE_OPENGL = 0
 VENDOR = custom
 !endif
 
 VENDOR = custom
 !endif
 

-# Build wxUniversal instead of native port? [0,1]
-!ifndef WXUNIV
-WXUNIV = 0
+# 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
 
 !endif