Enable using jom in place of nmake in the wxMSW build

[wxWidgets.git] / build / bakefiles / build_cfg.bkl

diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index 0364cb33fbb4de6ee746a34ea2fe79ca1c606192..6a677a5c5b2cebdf06faf189094116bb1583e65d 100644 (file)
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -8,8 +8,7 @@
     the library.
     -->
 
     the library.
     -->
 

-    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','cbuilderx'] and
-              TOOLKIT in ['PM','MSW','MGL','MOTIF']">
+    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']">

 
         <set var="BUILD_CFG_FILE" make_var="1">
             $(SETUPHDIR)$(DIRSEP)build.cfg
 
         <set var="BUILD_CFG_FILE" make_var="1">
             $(SETUPHDIR)$(DIRSEP)build.cfg


@@ -27,6 +26,8 @@
                 @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
                 @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
                 @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)
                 @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
                 @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
                 @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)

+                @echo TOOLKIT=$(TOOLKIT) >>$(BUILD_CFG_FILE)
+                @echo TOOLKIT_VERSION=$(TOOLKIT_VERSION) >>$(BUILD_CFG_FILE)

                 @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)
                 @echo CFG=$(CFG) >>$(BUILD_CFG_FILE)
                 @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)
                 @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)
                 @echo CFG=$(CFG) >>$(BUILD_CFG_FILE)
                 @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)


@@ -36,15 +37,22 @@
                 @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
                 @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
                 @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
                 @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
                 @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
                 @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)

+                @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)

                 @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
                 @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)

+                @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)

                 @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
                 @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
                 @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
                 @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
                 @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
                 @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)

-                @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)

                 @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
                 @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
                 @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
                 @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)

-               @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
+                @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)
+                @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)
+                @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)
+                @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)
+                @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
+                @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)

                 @echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
                 @echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)

+                @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)

                 @echo CC=$(CC) >>$(BUILD_CFG_FILE)
                 @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
                 @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)
                 @echo CC=$(CC) >>$(BUILD_CFG_FILE)
                 @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
                 @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)