This patch provides the include file common.gypi (cargo culted from another

project) which implements basic support for Debug and Release targets in the
gyp-generated project files.  All configurations build on all platforms with
the exception of Windows/Release, which seems to have compile errors not
resolved here.

Review URL:  http://codereview.appspot.com/4391042/



git-svn-id: http://skia.googlecode.com/svn/trunk@1101 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
senorblanco@chromium.org 2011-04-11 15:59:47 +00:00
parent cff1c7f490
commit afac88855a
2 changed files with 97 additions and 0 deletions

94
gyp/common.gypi Normal file
View File

@ -0,0 +1,94 @@
# Copyright (C) 2011 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
{
'conditions' : [
['OS == "win"',
{
'target_defaults': {
'msvs_cygwin_shell': 0,
'msvs_settings': {
'VCCLCompilerTool': {
'WarningLevel': '1',
'WarnAsError': 'false',
'DebugInformationFormat': '3',
'AdditionalOptions': '/MP',
},
},
'configurations': {
'Debug': {
'msvs_settings': {
'VCCLCompilerTool': {
'Optimization': '0', # 0 = /Od
'PreprocessorDefinitions': ['_DEBUG'],
'RuntimeLibrary': '3', # 3 = /MDd (debug DLL)
},
'VCLinkerTool': {
'GenerateDebugInformation': 'true',
},
},
},
'Release': {
'msvs_settings': {
'VCCLCompilerTool': {
'Optimization': '2', # 2 = /Os
'PreprocessorDefinitions': ['NDEBUG'],
'RuntimeLibrary': '2', # 2 = /MD (nondebug DLL)
},
'VCLinkerTool': {
'GenerateDebugInformation': 'false',
},
},
},
},
},
},
],
['OS == "linux"',
{
'target_defaults': {
'configurations': {
'Debug': {
'cflags': ['-g']
},
'Release': {
'cflags': ['-O2']
},
},
},
},
],
['OS == "mac"',
{
'target_defaults': {
'configurations': {
'Debug': {
'cflags': ['-g']
},
'Release': {
'cflags': ['-O2']
},
},
},
'xcode_settings': {
'SYMROOT': '<(DEPTH)/xcodebuild',
},
},
],
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:

View File

@ -45,6 +45,9 @@ def additional_include_files(args=[]):
if os.path.realpath(path) not in specified_includes:
result.append(path)
# Always include common.gypi
AddInclude(os.path.join(script_dir, 'common.gypi'))
return result
if __name__ == '__main__':