Skip to content

A
angle
Commit 39d5166d by Geoff Lang Committed by Geoff Lang
Options

Moved the gyp libGLESv2 and libEGL projects into their own gyp files. Renamed…

Moved the gyp libGLESv2 and libEGL projects into their own gyp files. Renamed build_angle.gpy* to angle.gyp* but kept build_angle.gyp for chrome compatability.
parent 17732823
Showing with 151 additions and 91 deletions
build/all.gyp
......@@ -13,7 +13,7 @@
# Otherwise auto-generated sln files will overwrite/conflict the
# manually maintained ones.
'../samples/build_samples.gyp:*',
'../src/build_angle.gyp:*',
'../src/angle.gyp:*',
'../tests/build_tests.gyp:*',
],
},
......
build/common.gypi
......@@ -59,6 +59,7 @@
'MinimalRebuild': 'false',
'PreprocessorDefinitions': [
'_CRT_SECURE_NO_DEPRECATE',
'_SCL_SECURE_NO_WARNINGS',
'_HAS_EXCEPTIONS=0',
'_WIN32_WINNT=0x0600',
'_WINDOWS',
......@@ -82,6 +83,9 @@
'AdditionalLibraryDirectories': [
'$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86',
],
'AdditionalDependencies': [
'%(AdditionalDependencies)',
]
},
'VCLibrarianTool': {
'AdditionalLibraryDirectories': [
......
samples/build_samples.gyp
......@@ -8,7 +8,7 @@
'target_name': 'essl_to_glsl',
'type': 'executable',
'dependencies': [
'../src/build_angle.gyp:translator',
'../src/angle.gyp:translator',
],
'include_dirs': [
'../include',
......@@ -25,7 +25,7 @@
'target_name': 'essl_to_hlsl',
'type': 'executable',
'dependencies': [
'../src/build_angle.gyp:translator',
'../src/angle.gyp:translator',
],
'include_dirs': [
'../include',
......@@ -45,8 +45,8 @@
'target_name': 'es_util',
'type': 'static_library',
'dependencies': [
'../src/build_angle.gyp:libEGL',
'../src/build_angle.gyp:libGLESv2',
'../src/angle.gyp:libEGL',
'../src/angle.gyp:libGLESv2',
],
'include_dirs': [
'gles2_book/Common',
......
src/angle.gyp 0 → 100644
# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'includes':
[
'angle.gypi',
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
src/angle.gypi 0 → 100644
# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'variables':
{
'angle_code': 1,
},
'includes':
[
'compiler.gypi',
'libGLESv2.gypi',
'libEGL.gypi'
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
src/build_angle.gyp
......@@ -3,9 +3,10 @@
# found in the LICENSE file.
{
'includes': [
'build_angle.gypi',
],
'includes':
[
'angle.gypi',
],
}
# Local Variables:
......
src/build_angle.gypi deleted 100644 → 0
# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'variables': {
'angle_code': 1,
},
'target_defaults': {
'defines': [
'ANGLE_DISABLE_TRACE',
'ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1',
'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }',
],
},
'includes': [
'compiler.gypi',
],
'conditions': [
['OS=="win"', {
'targets': [
{
'target_name': 'libGLESv2',
'type': 'shared_library',
'dependencies': ['translator'],
'include_dirs': [
'.',
'../include',
'libGLESv2',
],
'sources': [
'<!@(python enumerate_files.py common libGLESv2 third_party/murmurhash -types *.cpp *.h *.hlsl *.vs *.ps *.bat *.def)',
],
# TODO(jschuh): http://crbug.com/167187 size_t -> int
'msvs_disabled_warnings': [ 4267, 4996 ],
'msvs_settings': {
'VCLinkerTool': {
'AdditionalDependencies': [
'd3d9.lib',
'dxguid.lib',
'%(AdditionalDependencies)',
],
}
},
},
{
'target_name': 'libEGL',
'type': 'shared_library',
'dependencies': ['libGLESv2'],
'include_dirs': [
'.',
'../include',
'libGLESv2',
],
'sources': [
'<!@(python enumerate_files.py common libEGL -types *.cpp *.h *.def)',
],
# TODO(jschuh): http://crbug.com/167187 size_t -> int
'msvs_disabled_warnings': [ 4267 ],
'msvs_settings': {
'VCLinkerTool': {
'AdditionalDependencies': [
'd3d9.lib',
'%(AdditionalDependencies)',
],
}
},
},
],
}],
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
src/libEGL.gypi 0 → 100644
# Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'conditions':
[
['OS=="win"',
{
'targets':
[
{
'target_name': 'libEGL',
'type': 'shared_library',
'dependencies': ['libGLESv2'],
'include_dirs':
[
'.',
'../include',
'libGLESv2',
],
'sources': [ '<!@(python enumerate_files.py common libEGL -types *.cpp *.h *.def)' ],
'msvs_disabled_warnings': [ 4267 ],
'msvs_settings':
{
'VCLinkerTool':
{
'AdditionalDependencies':
[
'd3d9.lib',
'%(AdditionalDependencies)',
],
},
},
},
],
},
],
],
}
src/libGLESv2.gypi 0 → 100644
# Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'target_defaults':
{
'defines':
[
'ANGLE_DISABLE_TRACE',
'ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1',
'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }',
],
},
'conditions':
[
['OS=="win"',
{
'targets':
[
{
'target_name': 'libGLESv2',
'type': 'shared_library',
'dependencies': [ 'translator' ],
'include_dirs':
[
'.',
'../include',
'libGLESv2',
],
'defines':
[
'NOMINMAX',
],
'sources': [ '<!@(python enumerate_files.py common libGLESv2 third_party/murmurhash -types *.cpp *.h *.hlsl *.vs *.ps *.bat *.def)' ],
'msvs_disabled_warnings': [ 4267 ],
'msvs_settings':
{
'VCLinkerTool':
{
'AdditionalDependencies':
[
'd3d9.lib',
'dxguid.lib',
'%(AdditionalDependencies)',
]
}
},
},
],
},
],
],
}
tests/build_tests.gyp
......@@ -31,7 +31,7 @@
'target_name': 'preprocessor_tests',
'type': 'executable',
'dependencies': [
'../src/build_angle.gyp:preprocessor',
'../src/angle.gyp:preprocessor',
'gtest',
'gmock',
],
......@@ -67,7 +67,7 @@
'target_name': 'compiler_tests',
'type': 'executable',
'dependencies': [
'../src/build_angle.gyp:translator',
'../src/angle.gyp:translator',
'gtest',
'gmock',
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment