quote AM_PATH_WXCONFIG arguments before passing them to WX_CONFIG_CHECK, otherwise...

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

diff --git a/build/msw/config.vc b/build/msw/config.vc
index 700339dfe34bf8c366fd1306b4b2f5d2e838b679..6d81210c434a2b979f415d6044a835f8402ec6dc 100644 (file)
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -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.2 (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!
 # =========================================================================


@@ -28,6 +28,9 @@ CPPFLAGS =
 # Standard linker flags 
 LDFLAGS = 
 
 # Standard linker flags 
 LDFLAGS = 
 

+# The C preprocessor 
+CPP = $(CC) /EP /nologo
+

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


@@ -43,6 +46,15 @@ MSLU = 0
 # Type of compiled binaries [debug,release]
 BUILD = debug
 
 # Type of compiled binaries [debug,release]
 BUILD = debug
 

+# The target processor architecture must be specified when it is not X86.
+# This does not affect the compiler output, so you still need to make sure
+# your environment is set up appropriately with the correct compiler in the
+# PATH. Rather it affects some options passed to some of the common build
+# utilities such as the resource compiler and the linker.
+# 
+# Accepted values: AMD64, IA64. 
+TARGET_CPU = $(CPU)
+

 # 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]
 # 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]


@@ -53,7 +65,7 @@ DEBUG_INFO = default
 DEBUG_FLAG = default
 
 # Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
 DEBUG_FLAG = default
 
 # Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?

-# Acts according to DEBUG_INFO by default. [0,1,default]
+# Acts according to BUILD by default. [0,1,default]

 DEBUG_RUNTIME_LIBS = default
 
 # Multiple libraries or single huge monolithic one? [0,1]
 DEBUG_RUNTIME_LIBS = default
 
 # Multiple libraries or single huge monolithic one? [0,1]


@@ -65,15 +77,27 @@ USE_GUI = 1
 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1
 
 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1
 

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

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

+# Build wxAUI library (USE_GUI must be 1)? [0,1]
+USE_AUI = 1
+
+# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
+USE_RICHTEXT = 1
+

 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 
 # Build ODBC database classes (USE_GUI must be 1)? [0,1]
 USE_ODBC = 0
 
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 
 # Build ODBC database classes (USE_GUI must be 1)? [0,1]
 USE_ODBC = 0
 

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

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


@@ -83,6 +107,9 @@ USE_RTTI = 1
 # Enable threading in compiled code. [0,1]
 USE_THREADS = 1
 
 # Enable threading in compiled code. [0,1]
 USE_THREADS = 1
 

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

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