Skip to content

A
angle
Commit 704c716a by Geoff Lang
Options

Remove uses of enumerate_files in the sample projects.

Speeds up project generation a lot. BUG=angleproject:981 Change-Id: I3cb340baa8da3a30a2c861b584ba0e7758da5b4d Reviewed-on: https://chromium-review.googlesource.com/266873Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 2f3ba210
Showing with 57 additions and 34 deletions
samples/samples.gyp
......@@ -41,7 +41,18 @@
],
'sources':
[
'<!@(python <(angle_path)/enumerate_files.py sample_util -types *.cpp *.h)'
'sample_util/Matrix.cpp',
'sample_util/Matrix.h',
'sample_util/SampleApplication.cpp',
'sample_util/SampleApplication.h',
'sample_util/Vector.cpp',
'sample_util/Vector.h',
'sample_util/geometry_utils.cpp',
'sample_util/geometry_utils.h',
'sample_util/texture_utils.cpp',
'sample_util/texture_utils.h',
'sample_util/tga_utils.cpp',
'sample_util/tga_utils.h',
],
'msvs_disabled_warnings': [ 4201 ],
'direct_dependent_settings':
......@@ -59,7 +70,7 @@
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py hello_triangle -types *.cpp *.h)' ],
'sources': [ 'hello_triangle/HelloTriangle.cpp', ],
},
{
......@@ -67,7 +78,7 @@
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py mip_map_2d -types *.cpp *.h)' ],
'sources': [ 'mip_map_2d/MipMap2D.cpp', ],
},
{
......@@ -75,100 +86,112 @@
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py multi_texture -types *.cpp *.h)' ],
'sources': [ 'multi_texture/MultiTexture.cpp', ],
'copies':
[
{
'destination': '<(PRODUCT_DIR)',
'files': [ '<!@(python <(angle_path)/enumerate_files.py multi_texture -types *.tga)' ],
'files':
[
'multi_texture/basemap.tga',
'multi_texture/lightmap.tga',
],
},
]
},
{
'target_name': 'particle_system',
'target_name': 'multiple_draw_buffers',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py particle_system -types *.cpp *.h)' ],
'sources': [ 'multiple_draw_buffers/MultipleDrawBuffers.cpp', ],
'copies':
[
{
'destination': '<(PRODUCT_DIR)',
'files': [ '<!@(python <(angle_path)/enumerate_files.py particle_system -types *.tga)' ],
'files':
[
'multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl',
'multiple_draw_buffers/multiple_draw_buffers_fs.glsl',
'multiple_draw_buffers/multiple_draw_buffers_vs.glsl',
],
}
]
},
{
'target_name': 'simple_instancing',
'target_name': 'particle_system',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_instancing -types *.cpp *.h)' ],
'sources': [ 'particle_system/ParticleSystem.cpp', ],
'copies':
[
{
'destination': '<(PRODUCT_DIR)',
'files':
[
'particle_system/smoke.tga',
],
}
]
},
{
'target_name': 'tri_fan_microbench',
'target_name': 'post_sub_buffer',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py tri_fan_microbench -types *.cpp *.h *.glsl)' ],
'sources': [ 'post_sub_buffer/PostSubBuffer.cpp', ],
},
{
'target_name': 'tex_redef_microbench',
'target_name': 'simple_instancing',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py tex_redef_microbench -types *.cpp *.h *.glsl)' ],
'sources': [ 'simple_instancing/SimpleInstancing.cpp', ],
},
{
'target_name': 'multiple_draw_buffers',
'target_name': 'simple_texture_2d',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py multiple_draw_buffers -types *.cpp *.h *.glsl)' ],
'copies':
[
{
'destination': '<(PRODUCT_DIR)',
'files': [ '<!@(python <(angle_path)/enumerate_files.py multiple_draw_buffers -types *.glsl)' ],
}
]
'sources': [ 'simple_texture_2d/SimpleTexture2D.cpp', ],
},
{
'target_name': 'simple_texture_2d',
'target_name': 'simple_texture_cubemap',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_texture_2d -types *.cpp *.h)' ],
'sources': [ 'simple_texture_cubemap/SimpleTextureCubemap.cpp', ],
},
{
'target_name': 'simple_texture_cubemap',
'target_name': 'simple_vertex_shader',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_texture_cubemap -types *.cpp *.h)' ],
'sources': [ 'simple_vertex_shader/SimpleVertexShader.cpp', ],
},
{
'target_name': 'simple_vertex_shader',
'target_name': 'stencil_operations',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_vertex_shader -types *.cpp *.h)' ],
'sources': [ 'stencil_operations/StencilOperations.cpp', ],
},
{
'target_name': 'stencil_operations',
'target_name': 'tex_redef_microbench',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py stencil_operations -types *.cpp *.h)' ],
'sources': [ 'tex_redef_microbench/TexRedefMicroBench.cpp', ],
},
{
......@@ -176,15 +199,15 @@
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py texture_wrap -types *.cpp *.h)' ],
'sources': [ 'texture_wrap/TextureWrap.cpp', ],
},
{
'target_name': 'post_sub_buffer',
'target_name': 'tri_fan_microbench',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py post_sub_buffer -types *.cpp *.h)' ],
'sources': [ 'tri_fan_microbench/TriFanMicroBench.cpp', ],
},
],
}
......
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