54173a build system: added support for CFLAGS_UTIL, LDFLAGS_UTIL.

Authored and Committed by midipix 8 years ago
    build system: added support for CFLAGS_UTIL, LDFLAGS_UTIL.
    
        
file modified
+4 -0
Makefile.in CHANGED
@@ -21,6 +21,7 @@ CFLAGS_SYSROOT = @cflags_sysroot@
21
21
CFLAGS_OS = @cflags_os@
22
22
CFLAGS_SITE = @cflags_site@
23
23
CFLAGS_PATH = @cflags_path@
24
+ CFLAGS_UTIL = @cflags_util@
24
25
25
26
LDFLAGS_COMMON = @ldflags_common@
26
27
LDFLAGS_DEBUG = @ldflags_debug@
@@ -28,6 +29,7 @@ LDFLAGS_CMDLINE = @ldflags_cmdline@
28
29
LDFLAGS_CONFIG = @ldflags_config@
29
30
LDFLAGS_SYSROOT = @ldflags_sysroot@
30
31
LDFLAGS_PATH = @ldflags_path@
32
+ LDFLAGS_UTIL = @ldflags_util@
31
33
32
34
PE_SUBSYSTEM = @pe_subsystem@
33
35
PE_IMAGE_BASE = @pe_image_base@
@@ -289,6 +291,7 @@ clean: clean-implib
289
291
@echo CFLAGS_OS:' '$(CFLAGS_OS)
290
292
@echo CFLAGS_SITE:' '$(CFLAGS_SITE)
291
293
@echo CFLAGS_PATH:' '$(CFLAGS_PATH)
294
+ @echo CFLAGS_UTIL:' '$(CFLAGS_UTIL)
292
295
@echo
293
296
@echo LDFLAGS_COMMON:' '$(LDFLAGS_COMMON)
294
297
@echo LDFLAGS_DEBUG:' '$(LDFLAGS_DEBUG)
@@ -296,6 +299,7 @@ clean: clean-implib
296
299
@echo LDFLAGS_CONFIG:' '$(LDFLAGS_CONFIG)
297
300
@echo LDFLAGS_SYSROOT:' '$(LDFLAGS_SYSROOT)
298
301
@echo LDFLAGS_PATH:' '$(LDFLAGS_PATH)
302
+ @echo LDFLAGS_UTIL:' '$(LDFLAGS_UTIL)
299
303
@echo
300
304
301
305
.display-pe:
file modified
+2 -0
config.project CHANGED
@@ -26,6 +26,7 @@ mb_default_cflags_cmdline=
26
26
mb_default_cflags_config=
27
27
mb_default_cflags_sysroot=
28
28
mb_default_cflags_path=
29
+ mb_default_cflags_util=
29
30
30
31
mb_default_ldflags_common="-Llib"
31
32
mb_default_ldflags_debug=
@@ -33,6 +34,7 @@ mb_default_ldflags_cmdline=
33
34
mb_default_ldflags_config=
34
35
mb_default_ldflags_sysroot=
35
36
mb_default_ldflags_path=
37
+ mb_default_ldflags_util=
36
38
37
39
mb_default_pe_subsystem=windows
38
40
mb_default_pe_image_base=
file modified
+2 -0
config.usage CHANGED
@@ -68,6 +68,7 @@ supported variables:
68
68
CFLAGS_CONFIG
69
69
CFLAGS_SYSROOT
70
70
CFLAGS_PATH
71
+ CFLAGS_UTIL
71
72
72
73
LDFLAGS
73
74
LDFLAGS_DEBUG
@@ -76,6 +77,7 @@ supported variables:
76
77
LDFLAGS_CONFIG
77
78
LDFLAGS_SYSROOT
78
79
LDFLAGS_PATH
80
+ LDFLAGS_UTIL
79
81
80
82
PE_SUBSYSTEM
81
83
PE_IMAGE_BASE
file modified
+6 -0
configure CHANGED
@@ -68,6 +68,7 @@ init_vars()
68
68
mb_cflags_os=$CFLAGS_OS
69
69
mb_cflags_site=$CFLAGS_SITE
70
70
mb_cflags_path=$CFLAGS_PATH
71
+ mb_cflags_util=$CFLAGS_UTIL
71
72
72
73
mb_ldflags=$LDFLAGS
73
74
mb_ldflags_debug=$LDFLAGS_DEBUG
@@ -76,6 +77,7 @@ init_vars()
76
77
mb_ldflags_config=$LDFLAGS_CONFIG
77
78
mb_ldflags_sysroot=$LDFLAGS_SYSROOT
78
79
mb_ldflags_path=$LDFLAGS_PATH
80
+ mb_ldflags_util=$LDFLAGS_UTIL
79
81
80
82
mb_pe_subsystem=$PE_SUBSYSTEM
81
83
mb_pe_image_base=$PE_IMAGE_BASE
@@ -151,6 +153,7 @@ common_defaults()
151
153
[ -z "$mb_cflags_os" ] && mb_cflags_os=$mb_default_cflags_os
152
154
[ -z "$mb_cflags_site" ] && mb_cflags_site=$mb_default_cflags_site
153
155
[ -z "$mb_cflags_path" ] && mb_cflags_path=$mb_default_cflags_path
156
+ [ -z "$mb_cflags_util" ] && mb_cflags_util=$mb_default_cflags_util
154
157
155
158
[ -z "$mb_ldflags_debug" ] && mb_ldflags_debug=$mb_default_ldflags_debug
156
159
[ -z "$mb_ldflags_common" ] && mb_ldflags_common=$mb_default_ldflags_common
@@ -158,6 +161,7 @@ common_defaults()
158
161
[ -z "$mb_ldflags_config" ] && mb_ldflags_config=$mb_default_ldflags_config
159
162
[ -z "$mb_ldflags_sysroot" ] && mb_ldflags_sysroot=$mb_default_ldflags_sysroot
160
163
[ -z "$mb_ldflags_path" ] && mb_ldflags_path=$mb_default_ldflags_path
164
+ [ -z "$mb_ldflags_util" ] && mb_ldflags_util=$mb_default_ldflags_util
161
165
162
166
[ -z "$mb_pe_subsystem" ] && mb_pe_subsystem=$mb_default_pe_subsystem
163
167
[ -z "$mb_pe_image_base" ] && mb_pe_image_base=$mb_default_pe_image_base
@@ -344,6 +348,7 @@ config_copy()
344
348
-e 's^@cflags_os@^'"$mb_cflags_os"'^g' \
345
349
-e 's^@cflags_site@^'"$mb_cflags_site"'^g' \
346
350
-e 's^@cflags_path@^'"$mb_cflags_path"'^g' \
351
+ -e 's^@cflags_util@^'"$mb_cflags_util"'^g' \
347
352
\
348
353
-e 's^@ldflags@^'"$mb_ldflags"'^g' \
349
354
-e 's^@ldflags_debug@^'"$mb_ldflags_debug"'^g' \
@@ -352,6 +357,7 @@ config_copy()
352
357
-e 's^@ldflags_config@^'"$mb_ldflags_config"'^g' \
353
358
-e 's^@ldflags_sysroot@^'"$mb_ldflags_sysroot"'^g' \
354
359
-e 's^@ldflags_path@^'"$mb_ldflags_path"'^g' \
360
+ -e 's^@ldflags_util@^'"$mb_ldflags_util"'^g' \
355
361
\
356
362
-e 's^@pe_subsystem@^'"$mb_pe_subsystem"'^g' \
357
363
-e 's^@pe_image\_base@^'"$mb_pe_image_base"'^g' \
file modified
+3 -2
project/defs.mk CHANGED
@@ -46,7 +46,7 @@ CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_CONFIG) $(CFLAGS_SYSROOT) \
46
46
47
47
CFLAGS_SHARED = $(CFLAGS) $(CFLAGS_PIC) $(CFLAGS_SHARED_ATTR)
48
48
CFLAGS_STATIC = $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_STATIC_ATTR)
49
- CFLAGS_APP = $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_APP_ATTR)
49
+ CFLAGS_APP = $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_APP_ATTR) $(CFLAGS_UTIL)
50
50
51
51
LDFLAGS_SHARED = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \
52
52
$(LDFLAGS_COMMON) $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST) \
@@ -54,7 +54,8 @@ LDFLAGS_SHARED = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \
54
54
55
55
LDFLAGS_APP = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \
56
56
$(LDFLAGS_COMMON) $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST) \
57
- $(LDFLAGS_PATH) $(SHARED_APP_DEPS) $(LDFLAGS_LAST)
57
+ $(LDFLAGS_PATH) $(SHARED_APP_DEPS) $(LDFLAGS_LAST) \
58
+ $(LDFLAGS_UTIL)
58
59
59
60
LDFLAGS_STATIC = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \
60
61
$(LDFLAGS_COMMON) $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST) \