AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

combine target_defaults.gypi into common.gypi

Browse Source 
http://codereview.appspot.com/4654080



git-svn-id: http://skia.googlecode.com/svn/trunk@1780 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
epoger@google.com 2011-07-01 17:16:26 +00:00
parent 0c8d93a940
commit 5351b373b3
26 changed files with 100 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gyp/CocoaDebuggerApp.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/FileReaderApp.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

4
gyp/SampleApp.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{
@ -158,8 +158,6 @@
'VCLinkerTool': {
'SubSystem': '2',
'AdditionalDependencies': [
'OpenGL32.lib',
'usp10.lib',
'd3d9.lib',
],
},

2
gyp/SimpleCocoaApp.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/animator.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

5
gyp/apptype_console.gypi
View File

@ -10,11 +10,6 @@
#Console app, use main/wmain
'EntryPointSymbol': 'mainCRTStartup',
'AdditionalDependencies': [
'OpenGL32.lib',
'usp10.lib',
],
},
},
},

2
gyp/bench.gyp
View File

@ -9,7 +9,7 @@
{
'includes': [
'apptype_console.gypi',
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

74
gyp/common.gypi
View File

@ -12,10 +12,51 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{
'target_defaults': {
# Define variables, and allow for override in GYP_DEFINES environment var.
'variables': {
'skia_scalar%': 'float',
},
'skia_scalar%': '<(skia_scalar)',
'configurations': {
'Debug': {
'defines': [
'SK_DEBUG',
'GR_DEBUG=1',
],
},
'Release': {
'defines': [
'SK_RELEASE',
'GR_RELEASE=1',
],
},
},
'conditions' : [
[ 'skia_scalar == "float"',
{
'defines': [
'SK_SCALAR_IS_FLOAT',
'SK_CAN_USE_FLOAT',
],
}, { # else, skia_scalar != "float"
'defines': [
'SK_SCALAR_IS_FIXED',
'SK_CAN_USE_FLOAT', # we can still use floats along the way
],
}
],
['OS == "win"',
{
'target_defaults': {
'defines': [
'SK_BUILD_FOR_WIN32',
'SK_IGNORE_STDINT_DOT_H',
],
'msvs_cygwin_shell': 0,
'msvs_settings': {
'VCCLCompilerTool': {
@ -24,6 +65,12 @@
'DebugInformationFormat': '3',
'AdditionalOptions': '/MP',
},
'VCLinkerTool': {
'AdditionalDependencies': [
'OpenGL32.lib',
'usp10.lib',
],
},
},
'configurations': {
'Debug': {
@ -52,11 +99,14 @@
},
},
},
},
],
['OS == "linux"',
['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"',
{
'target_defaults': {
'defines': [
'SK_SAMPLES_FOR_X',
'SK_BUILD_FOR_UNIX',
],
'configurations': {
'Debug': {
'cflags': ['-g']
@ -65,13 +115,18 @@
'cflags': ['-O2']
},
},
'cflags': [ '-Wall', '-Wextra', '-Wno-unused' ]
},
'cflags': [ '-Wall', '-Wextra', '-Wno-unused' ],
'include_dirs' : [
'/usr/include/freetype2',
],
},
],
['OS == "mac"',
{
'target_defaults': {
'defines': [
'SK_BUILD_FOR_MAC',
],
'configurations': {
'Debug': {
'cflags': ['-g']
@ -80,13 +135,14 @@
'cflags': ['-O2']
},
},
},
'xcode_settings': {
'SYMROOT': '<(DEPTH)/xcodebuild',
},
},
],
],
], # end 'conditions'
}, # end 'target_defaults'
}
# Local Variables:
# tab-width:2

2
gyp/core.gyp
View File

@ -1,7 +1,7 @@
# Core Skia library code.
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/effects.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/experimental.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/gm.gyp
View File

@ -2,7 +2,7 @@
{
'includes': [
'apptype_console.gypi',
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/gpu.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/images.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/libtess.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/opts.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
# Due to an unfortunate intersection of lameness between gcc and gyp,

2
gyp/pdf.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/svg.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

95
gyp/target_defaults.gypi
View File

@ -1,95 +0,0 @@
{
'target_defaults': {
'defines': [
'SK_CAN_USE_FLOAT',
],
'variables': {
'skia_scalar%': 'float',
},
# Allow override in GYP_DEFINES environment variable.
'skia_scalar%': '<(skia_scalar)',
'configurations': {
'Debug': {
'defines': [
'SK_DEBUG',
'GR_DEBUG=1',
],
'msvs_settings': {
'VCLinkerTool': {
'GenerateDebugInformation': 'true',
},
'VCCLCompilerTool': {
#0 Disabled (/Od)
#1 Minimize Size (/O1)
#2 Maximize Speed (/O2)
#3 Full Optimization (/Ox)
'Optimization': '0',
},
},
},
'Release': {
'defines': [
'SK_RELEASE',
'GR_RELEASE=1',
],
},
},
'conditions': [
[ 'skia_scalar == "float"',
{
'defines': [
'SK_SCALAR_IS_FLOAT',
],
}, { # else, skia_scalar != "float"
'defines': [
'SK_SCALAR_IS_FIXED',
],
}
],
[ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
'include_dirs' : [
'/usr/include/freetype2',
],
}],
[ 'OS == "mac"', {
'defines': [
'SK_BUILD_FOR_MAC',
],
}],
[ 'OS == "win"', {
'defines': [
'SK_BUILD_FOR_WIN32',
'SK_IGNORE_STDINT_DOT_H',
],
}],
[ 'OS == "linux"', {
'defines': [
'SK_SAMPLES_FOR_X',
'SK_BUILD_FOR_UNIX',
],
}],
],
'direct_dependent_settings': {
'conditions': [
[ 'OS == "mac"', {
'defines': [
'SK_BUILD_FOR_MAC',
],
}],
[ 'OS == "win"', {
'defines': [
'SK_BUILD_FOR_WIN32',
],
}],
],
},
},
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:

2
gyp/tests.gyp
View File

@ -2,7 +2,7 @@
{
'includes': [
'apptype_console.gypi',
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/tools.gyp
View File

@ -8,7 +8,7 @@
{
'includes': [
'apptype_console.gypi',
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/utils.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/views.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/xml.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

2
gyp/zlib.gyp
View File

@ -1,6 +1,6 @@
{
'includes': [
'target_defaults.gypi',
'common.gypi',
],
'targets': [
{

3
gyp_skia
View File

@ -53,9 +53,6 @@ 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(gyp_config_dir, 'common.gypi'))
return result
if __name__ == '__main__':