summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json40
1 files changed, 37 insertions, 3 deletions
diff --git a/configure.json b/configure.json
index 06c62f5aea..02d5f1a65e 100644
--- a/configure.json
+++ b/configure.json
@@ -93,6 +93,7 @@
"nomake": { "type": "addString", "values": [ "examples", "tests", "tools" ] },
"opensource": { "type": "void", "name": "commercial", "value": "no" },
"optimize-debug": { "type": "boolean", "name": "optimize_debug" },
+ "optimize-size": { "type": "boolean", "name": "optimize_size" },
"optimized-qmake": { "type": "boolean", "name": "release_tools" },
"optimized-tools": { "type": "boolean", "name": "release_tools" },
"pch": { "type": "boolean", "name": "precompile_header" },
@@ -405,11 +406,23 @@
"type": "compile",
"test": "unix/posix_fallocate"
},
- "alloca": {
- "label": "alloca()",
+ "alloca_stdlib_h": {
+ "label": "alloca() in stdlib.h",
"type": "compile",
"test": "common/alloca"
},
+ "alloca_h": {
+ "label": "alloca() in alloca.h",
+ "type": "compile",
+ "test": "common/alloca",
+ "args": "DEFINES+=USE_ALLOCA_H"
+ },
+ "alloca_malloc_h": {
+ "label": "alloca() in malloc.h",
+ "type": "compile",
+ "test": "common/alloca",
+ "args": "DEFINES+=USE_MALLOC_H"
+ },
"stack_protector": {
"label": "stack protection",
"type": "compilerSupportsFlag",
@@ -485,6 +498,12 @@
"condition": "!config.msvc && (features.debug || features.debug_and_release) && tests.optimize_debug",
"output": [ "privateConfig" ]
},
+ "optimize_size": {
+ "label": "Optimize release build for size",
+ "autoDetect": false,
+ "condition": "!features.debug || features.debug_and_release",
+ "output": [ "privateConfig" ]
+ },
"architecture": {
"label": "Architecture",
"output": [ "architecture" ]
@@ -893,9 +912,19 @@
"condition": "tests.posix_fallocate",
"output": [ "privateFeature" ]
},
+ "alloca_h": {
+ "label": "alloca.h",
+ "condition": "tests.alloca_h",
+ "output": [ "privateFeature" ]
+ },
+ "alloca_malloc_h": {
+ "label": "alloca() in malloc.h",
+ "condition": "!features.alloca_h && tests.alloca_malloc_h",
+ "output": [ "privateFeature" ]
+ },
"alloca": {
"label": "alloca()",
- "condition": "tests.alloca",
+ "condition": "features.alloca_h || features.alloca_malloc_h || tests.alloca_stdlib_h",
"output": [ "privateFeature" ]
},
"stack-protector-strong": {
@@ -1090,6 +1119,11 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
"args": "optimize_debug",
"condition": "!config.msvc && (features.debug || features.debug_and_release)"
},
+ {
+ "type": "feature",
+ "args": "optimize_size",
+ "condition": "!features.debug || features.debug_and_release"
+ },
"shared",
{
"message": "Using C++ standard",