From 0e43546701586592e5ffa7222719c10b27ebcb1f Mon Sep 17 00:00:00 2001 From: Geoff Lang Date: Tue, 3 Sep 2013 15:21:51 -0400 Subject: [PATCH] Refactored the samples.gyp file. --- build/all.gyp | 2 +- samples/build_samples.gyp | 178 ------------------------------------- samples/enumerate_files.py | 26 ++++++ samples/samples.gyp | 168 ++++++++++++++++++++++++++++++++++ 4 files changed, 195 insertions(+), 179 deletions(-) delete mode 100644 samples/build_samples.gyp create mode 100644 samples/enumerate_files.py create mode 100644 samples/samples.gyp diff --git a/build/all.gyp b/build/all.gyp index 047e6e85d..a8642ccdb 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -12,7 +12,7 @@ # as soon as we can get rid of manually-maintained sln files. # Otherwise auto-generated sln files will overwrite/conflict the # manually maintained ones. - '../samples/build_samples.gyp:*', + '../samples/samples.gyp:*', '../src/angle.gyp:*', '../tests/build_tests.gyp:*', ], diff --git a/samples/build_samples.gyp b/samples/build_samples.gyp deleted file mode 100644 index 0b039d10e..000000000 --- a/samples/build_samples.gyp +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright (c) 2010 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. - -{ - 'targets': [ - { - 'target_name': 'essl_to_glsl', - 'type': 'executable', - 'dependencies': [ - '../src/angle.gyp:translator', - ], - 'include_dirs': [ - '../include', - ], - 'sources': [ - 'translator/translator.cpp', - ], - }, - ], - 'conditions': [ - ['OS=="win"', { - 'targets': [ - { - 'target_name': 'essl_to_hlsl', - 'type': 'executable', - 'dependencies': [ - '../src/angle.gyp:translator', - ], - 'include_dirs': [ - '../include', - '../src', - ], - 'sources': [ - 'translator/translator.cpp', - '../src/common/debug.cpp', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': ['d3d9.lib'], - } - } - }, - { - 'target_name': 'es_util', - 'type': 'static_library', - 'dependencies': [ - '../src/angle.gyp:libEGL', - '../src/angle.gyp:libGLESv2', - ], - 'include_dirs': [ - 'gles2_book/Common', - '../include', - ], - 'sources': [ - 'gles2_book/Common/esShader.c', - 'gles2_book/Common/esShapes.c', - 'gles2_book/Common/esTransform.c', - 'gles2_book/Common/esUtil.c', - 'gles2_book/Common/esUtil.h', - 'gles2_book/Common/esUtil_win.h', - 'gles2_book/Common/Win32/esUtil_TGA.c', - 'gles2_book/Common/Win32/esUtil_win32.c', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'gles2_book/Common', - '../include', - ], - }, - }, - { - 'target_name': 'hello_triangle', - 'type': 'executable', - 'dependencies': ['es_util'], - 'sources': [ - 'gles2_book/Hello_Triangle/Hello_Triangle.c', - ], - }, - { - 'target_name': 'mip_map_2d', - 'type': 'executable', - 'dependencies': ['es_util'], - 'sources': [ - 'gles2_book/MipMap2D/MipMap2D.c', - ], - }, - { - 'target_name': 'multi_texture', - 'type': 'executable', - 'dependencies': ['es_util'], - 'sources': [ - 'gles2_book/MultiTexture/MultiTexture.c', - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - 'gles2_book/MultiTexture/basemap.tga', - 'gles2_book/MultiTexture/lightmap.tga', - ], - }, - ], - }, - { - 'target_name': 'particle_system', - 'type': 'executable', - 'dependencies': ['es_util'], - 'sources': [ - 'gles2_book/ParticleSystem/ParticleSystem.c', - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - 'gles2_book/ParticleSystem/smoke.tga', - ], - }, - ], - }, - { - 'target_name': 'simple_texture_2d', - 'type': 'executable', - 'dependencies': ['es_util'], - 'sources': [ - 'gles2_book/Simple_Texture2D/Simple_Texture2D.c', - ], - }, - { - 'target_name': 'simple_texture_cubemap', - 'type': 'executable', - 'dependencies': ['es_util'], - 'sources': [ - 'gles2_book/Simple_TextureCubemap/Simple_TextureCubemap.c', - ], - }, - { - 'target_name': 'simple_vertex_shader', - 'type': 'executable', - 'dependencies': ['es_util'], - 'sources': [ - 'gles2_book/Simple_VertexShader/Simple_VertexShader.c', - ], - }, - { - 'target_name': 'stencil_test', - 'type': 'executable', - 'dependencies': ['es_util'], - 'sources': [ - 'gles2_book/Stencil_Test/Stencil_Test.c', - ], - }, - { - 'target_name': 'texture_wrap', - 'type': 'executable', - 'dependencies': ['es_util'], - 'sources': [ - 'gles2_book/TextureWrap/TextureWrap.c', - ], - }, - { - 'target_name': 'post_sub_buffer', - 'type': 'executable', - 'dependencies': ['es_util'], - 'sources': [ - 'gles2_book/PostSubBuffer/PostSubBuffer.c', - ], - }, - ], - }], - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/samples/enumerate_files.py b/samples/enumerate_files.py new file mode 100644 index 000000000..412647294 --- /dev/null +++ b/samples/enumerate_files.py @@ -0,0 +1,26 @@ +import fnmatch +import os +import sys + +rootdirs = [ ] +filetypes = [ ] + +foundTypesArg = False +for i in range(1, len(sys.argv)): + arg = sys.argv[i] + if arg == "-types": + foundTypesArg = True + continue + + if foundTypesArg: + filetypes.append(arg) + else: + rootdirs.append(arg) + +for rootdir in rootdirs: + for root, dirnames, filenames in os.walk(rootdir): + for file in filenames: + for type in filetypes: + if fnmatch.fnmatchcase(file, type): + print os.path.join(root, file).replace("\\", "/") + break diff --git a/samples/samples.gyp b/samples/samples.gyp new file mode 100644 index 000000000..be4607bc9 --- /dev/null +++ b/samples/samples.gyp @@ -0,0 +1,168 @@ +# Copyright (c) 2010 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. + +{ + 'targets': + [ + { + 'target_name': 'essl_to_glsl', + 'type': 'executable', + 'dependencies': [ '../src/angle.gyp:translator', ], + 'include_dirs': [ '../include', ], + 'sources': [ '