Skip to content

A
angle
Commit 413fd933 by Geoff Lang
Options

Move all GLES samples into the samples directory.

There was no real reason to keep them in an angle directory and it makes the generated projects nicer. BUG=angleproject:981 Change-Id: I844e44dc5c2df51f5292cff4bdffe5e951745aae Reviewed-on: https://chromium-review.googlesource.com/266871Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 53643854
Showing with 20 additions and 20 deletions
samples/samples.gyp
...@@ -53,11 +53,11 @@ ...@@ -53,11 +53,11 @@
'include_dirs': 'include_dirs':
[ [
'<(angle_path)/include', '<(angle_path)/include',
'angle/sample_util', 'sample_util',
], ],
'sources': 'sources':
[ [
'<!@(python <(angle_path)/enumerate_files.py angle/sample_util -types *.cpp *.h)' '<!@(python <(angle_path)/enumerate_files.py sample_util -types *.cpp *.h)'
], ],
'msvs_disabled_warnings': [ 4201 ], 'msvs_disabled_warnings': [ 4201 ],
'direct_dependent_settings': 'direct_dependent_settings':
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
'msvs_disabled_warnings': [ 4201 ], 'msvs_disabled_warnings': [ 4201 ],
'include_dirs': 'include_dirs':
[ [
'angle/sample_util', 'sample_util',
], ],
}, },
}, },
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/hello_triangle -types *.cpp *.h)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py hello_triangle -types *.cpp *.h)' ],
}, },
{ {
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/mip_map_2d -types *.cpp *.h)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py mip_map_2d -types *.cpp *.h)' ],
}, },
{ {
...@@ -91,12 +91,12 @@ ...@@ -91,12 +91,12 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/multi_texture -types *.cpp *.h)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py multi_texture -types *.cpp *.h)' ],
'copies': 'copies':
[ [
{ {
'destination': '<(PRODUCT_DIR)', 'destination': '<(PRODUCT_DIR)',
'files': [ '<!@(python <(angle_path)/enumerate_files.py angle/multi_texture -types *.tga)' ], 'files': [ '<!@(python <(angle_path)/enumerate_files.py multi_texture -types *.tga)' ],
}, },
] ]
}, },
...@@ -106,12 +106,12 @@ ...@@ -106,12 +106,12 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/particle_system -types *.cpp *.h)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py particle_system -types *.cpp *.h)' ],
'copies': 'copies':
[ [
{ {
'destination': '<(PRODUCT_DIR)', 'destination': '<(PRODUCT_DIR)',
'files': [ '<!@(python <(angle_path)/enumerate_files.py angle/particle_system -types *.tga)' ], 'files': [ '<!@(python <(angle_path)/enumerate_files.py particle_system -types *.tga)' ],
} }
] ]
}, },
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/simple_instancing -types *.cpp *.h)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_instancing -types *.cpp *.h)' ],
}, },
{ {
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/tri_fan_microbench -types *.cpp *.h *.glsl)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py tri_fan_microbench -types *.cpp *.h *.glsl)' ],
}, },
{ {
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/tex_redef_microbench -types *.cpp *.h *.glsl)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py tex_redef_microbench -types *.cpp *.h *.glsl)' ],
}, },
{ {
...@@ -145,12 +145,12 @@ ...@@ -145,12 +145,12 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/multiple_draw_buffers -types *.cpp *.h *.glsl)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py multiple_draw_buffers -types *.cpp *.h *.glsl)' ],
'copies': 'copies':
[ [
{ {
'destination': '<(PRODUCT_DIR)', 'destination': '<(PRODUCT_DIR)',
'files': [ '<!@(python <(angle_path)/enumerate_files.py angle/multiple_draw_buffers -types *.glsl)' ], 'files': [ '<!@(python <(angle_path)/enumerate_files.py multiple_draw_buffers -types *.glsl)' ],
} }
] ]
}, },
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/simple_texture_2d -types *.cpp *.h)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_texture_2d -types *.cpp *.h)' ],
}, },
{ {
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/simple_texture_cubemap -types *.cpp *.h)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_texture_cubemap -types *.cpp *.h)' ],
}, },
{ {
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/simple_vertex_shader -types *.cpp *.h)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_vertex_shader -types *.cpp *.h)' ],
}, },
{ {
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/stencil_operations -types *.cpp *.h)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py stencil_operations -types *.cpp *.h)' ],
}, },
{ {
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/texture_wrap -types *.cpp *.h)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py texture_wrap -types *.cpp *.h)' ],
}, },
{ {
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'sample_util' ], 'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/post_sub_buffer -types *.cpp *.h)' ], 'sources': [ '<!@(python <(angle_path)/enumerate_files.py post_sub_buffer -types *.cpp *.h)' ],
}, },
], ],
} }
......
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