Output the values of all USE_XXX options to build.cfg file in MSW builds.

USE_RTTI, USE_AUI, USE_PROPGRID, USE_RIBBON, USE_RICHTEXT, USE_STC and USE_XRC
options were not output to the build configuration file, unlike the rest of
them.

Do output those ones as well now for consistency.

Also sort the options corresponding to different wx libraries alphabetically.

Closes #14608.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index afe8104af5e22a7c24dfb5d8e3faf0cdaff5368a..bcf7b977a0cc133e14663abf2f0370159bc1931d 100644 (file)
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -35,13 +35,20 @@
                 @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_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
                 @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)

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

                 @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
                 @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
                 @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
                 @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
                 @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
                 @echo USE_QA=$(USE_QA) >>$(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_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)
                 @echo CC=$(CC) >>$(BUILD_CFG_FILE)
                 @echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
                 @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)
                 @echo CC=$(CC) >>$(BUILD_CFG_FILE)

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 65c786fcd96e1dffb70185b8baf3af9587d8e65f..c4b2d920850e8d64ddc4ad64401445e02ccd3cf7 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -5417,13 +5417,20 @@ build_cfg_file: $(SETUPHDIR)
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r

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

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

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

        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r

-       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)\r

        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r

+       @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=bcc >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r
        @echo COMPILER=bcc >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index ce845a7241c70ec0f192114729511edf8db672c5..dc211b2e71b05d5e5e4aa55ad3310e41b266ee61 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -5586,13 +5586,20 @@ build_cfg_file: $(SETUPHDIR)
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r

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

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

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

        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r

-       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)\r

        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r

+       @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=gcc >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r
        @echo COMPILER=gcc >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 881307bdfcc9592c6895c0947077605673feb4f4..33da3d6ae104844ef374b43edb3f345cbe9741d5 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -6101,13 +6101,20 @@ build_cfg_file: $(SETUPHDIR)
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r

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

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

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

        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r

-       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)\r

        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r

+       @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=vc >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r
        @echo COMPILER=vc >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index b1db5320a3ef490dc5b5add3d85055db342b3a89..395e560538aefb07b8c77f32ffca1f830cd0c90e 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -5859,13 +5859,20 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=0 >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=0 >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r

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

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

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

        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r

-       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)\r

        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r

+       @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=wat >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r
        @echo COMPILER=wat >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r