|
|
@ -239,7 +239,6 @@ |
|
|
|
'WIN32', |
|
|
|
], |
|
|
|
'msvs_configuration_attributes': { |
|
|
|
'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', |
|
|
|
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
|
|
|
'CharacterSet': '1', |
|
|
|
}, |
|
|
@ -271,7 +270,7 @@ |
|
|
|
'target_conditions': [ |
|
|
|
['_toolset=="host"', { |
|
|
|
'variables': { |
|
|
|
'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)', |
|
|
|
'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)', |
|
|
|
}, |
|
|
|
'cflags': [ '<(m32flag)' ], |
|
|
|
'ldflags': [ '<(m32flag)' ], |
|
|
@ -281,7 +280,7 @@ |
|
|
|
}], |
|
|
|
['_toolset=="target"', { |
|
|
|
'variables': { |
|
|
|
'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)', |
|
|
|
'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)', |
|
|
|
}, |
|
|
|
'cflags': [ '<(m32flag)' ], |
|
|
|
'ldflags': [ '<(m32flag)' ], |
|
|
@ -324,7 +323,7 @@ |
|
|
|
}, |
|
|
|
'conditions': [ |
|
|
|
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { |
|
|
|
'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', |
|
|
|
'cflags': [ '-Wno-unused-parameter', |
|
|
|
'-Wnon-virtual-dtor', '-Woverloaded-virtual' ], |
|
|
|
}], |
|
|
|
], |
|
|
@ -333,10 +332,6 @@ |
|
|
|
'conditions': [ |
|
|
|
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ |
|
|
|
or OS=="android"', { |
|
|
|
'cflags!': [ |
|
|
|
'-O2', |
|
|
|
'-Os', |
|
|
|
], |
|
|
|
'cflags': [ |
|
|
|
'-fdata-sections', |
|
|
|
'-ffunction-sections', |
|
|
|