|
@ -259,7 +259,6 @@ |
|
|
'WIN32', |
|
|
'WIN32', |
|
|
], |
|
|
], |
|
|
'msvs_configuration_attributes': { |
|
|
'msvs_configuration_attributes': { |
|
|
'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', |
|
|
|
|
|
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
|
|
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
|
|
'CharacterSet': '1', |
|
|
'CharacterSet': '1', |
|
|
}, |
|
|
}, |
|
@ -344,7 +343,7 @@ |
|
|
}, |
|
|
}, |
|
|
'conditions': [ |
|
|
'conditions': [ |
|
|
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { |
|
|
['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' ], |
|
|
'-Wnon-virtual-dtor', '-Woverloaded-virtual' ], |
|
|
}], |
|
|
}], |
|
|
['OS=="android"', { |
|
|
['OS=="android"', { |
|
@ -367,10 +366,6 @@ |
|
|
'conditions': [ |
|
|
'conditions': [ |
|
|
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ |
|
|
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ |
|
|
or OS=="android"', { |
|
|
or OS=="android"', { |
|
|
'cflags!': [ |
|
|
|
|
|
'-O2', |
|
|
|
|
|
'-Os', |
|
|
|
|
|
], |
|
|
|
|
|
'cflags': [ |
|
|
'cflags': [ |
|
|
'-fdata-sections', |
|
|
'-fdata-sections', |
|
|
'-ffunction-sections', |
|
|
'-ffunction-sections', |
|
|