Skip to content

A
angle
Commit 84a96288 by alokp@chromium.org
Options

Moved windows-only targets into OS==win conditional.

Review URL: http://codereview.appspot.com/1473043 git-svn-id: https://angleproject.googlecode.com/svn/trunk@325 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent dd7948b3
Showing with 205 additions and 191 deletions
samples/build_samples.gyp
...@@ -30,123 +30,129 @@ ...@@ -30,123 +30,129 @@
'translator/translator.cpp', 'translator/translator.cpp',
], ],
}, },
{ ],
'target_name': 'es_util', 'conditions': [
'type': 'static_library', ['OS=="win"', {
'dependencies': [ 'targets': [
'../src/build_angle.gyp:libEGL',
'../src/build_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)', 'target_name': 'es_util',
'files': [ 'type': 'static_library',
'gles2_book/MultiTexture/basemap.tga', 'dependencies': [
'gles2_book/MultiTexture/lightmap.tga', '../src/build_angle.gyp:libEGL',
'../src/build_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': 'particle_system',
'type': 'executable',
'dependencies': ['es_util'],
'sources': [
'gles2_book/ParticleSystem/ParticleSystem.c',
],
'copies': [
{ {
'destination': '<(PRODUCT_DIR)', 'target_name': 'hello_triangle',
'files': [ 'type': 'executable',
'gles2_book/ParticleSystem/smoke.tga', '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': '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',
],
},
], ],
} }
......
src/build_angle.gyp
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
'--outfile=<(glslang_cpp_file)', '--outfile=<(glslang_cpp_file)',
'<(_inputs)', '<(_inputs)',
], ],
'message': 'Executing flex on <(_inputs)',
}, },
{ {
'action_name': 'bison_glslang', 'action_name': 'bison_glslang',
...@@ -107,6 +108,7 @@ ...@@ -107,6 +108,7 @@
'--output=<(glslang_tab_cpp_file)', '--output=<(glslang_tab_cpp_file)',
'<(_inputs)', '<(_inputs)',
], ],
'message': 'Executing bison on <(_inputs)',
}, },
], ],
}, },
...@@ -144,88 +146,94 @@ ...@@ -144,88 +146,94 @@
'compiler/UnfoldSelect.h', 'compiler/UnfoldSelect.h',
], ],
}, },
{ ],
'target_name': 'libGLESv2', 'conditions': [
'type': 'shared_library', ['OS=="win"', {
'dependencies': ['translator_hlsl'], 'targets': [
'include_dirs': [ {
'.', 'target_name': 'libGLESv2',
'../include', 'type': 'shared_library',
'$(DXSDK_DIR)/include', 'dependencies': ['translator_hlsl'],
], 'include_dirs': [
'sources': [ '.',
'common/angleutils.h', '../include',
'common/debug.cpp', '$(DXSDK_DIR)/include',
'common/debug.h', ],
'libGLESv2/geometry/backend.cpp', 'sources': [
'libGLESv2/geometry/backend.h', 'common/angleutils.h',
'libGLESv2/geometry/dx9.cpp', 'common/debug.cpp',
'libGLESv2/geometry/dx9.h', 'common/debug.h',
'libGLESv2/geometry/IndexDataManager.cpp', 'libGLESv2/geometry/backend.cpp',
'libGLESv2/geometry/IndexDataManager.h', 'libGLESv2/geometry/backend.h',
'libGLESv2/geometry/vertexconversion.h', 'libGLESv2/geometry/dx9.cpp',
'libGLESv2/geometry/VertexDataManager.cpp', 'libGLESv2/geometry/dx9.h',
'libGLESv2/geometry/VertexDataManager.h', 'libGLESv2/geometry/IndexDataManager.cpp',
'libGLESv2/Blit.cpp', 'libGLESv2/geometry/IndexDataManager.h',
'libGLESv2/Blit.h', 'libGLESv2/geometry/vertexconversion.h',
'libGLESv2/Buffer.cpp', 'libGLESv2/geometry/VertexDataManager.cpp',
'libGLESv2/Buffer.h', 'libGLESv2/geometry/VertexDataManager.h',
'libGLESv2/Context.cpp', 'libGLESv2/Blit.cpp',
'libGLESv2/Context.h', 'libGLESv2/Blit.h',
'libGLESv2/Framebuffer.cpp', 'libGLESv2/Buffer.cpp',
'libGLESv2/Framebuffer.h', 'libGLESv2/Buffer.h',
'libGLESv2/libGLESv2.cpp', 'libGLESv2/Context.cpp',
'libGLESv2/libGLESv2.def', 'libGLESv2/Context.h',
'libGLESv2/main.cpp', 'libGLESv2/Framebuffer.cpp',
'libGLESv2/main.h', 'libGLESv2/Framebuffer.h',
'libGLESv2/mathutil.h', 'libGLESv2/libGLESv2.cpp',
'libGLESv2/Program.cpp', 'libGLESv2/libGLESv2.def',
'libGLESv2/Program.h', 'libGLESv2/main.cpp',
'libGLESv2/Renderbuffer.cpp', 'libGLESv2/main.h',
'libGLESv2/Renderbuffer.h', 'libGLESv2/mathutil.h',
'libGLESv2/Shader.cpp', 'libGLESv2/Program.cpp',
'libGLESv2/Shader.h', 'libGLESv2/Program.h',
'libGLESv2/Texture.cpp', 'libGLESv2/Renderbuffer.cpp',
'libGLESv2/Texture.h', 'libGLESv2/Renderbuffer.h',
'libGLESv2/utilities.cpp', 'libGLESv2/Shader.cpp',
'libGLESv2/utilities.h', 'libGLESv2/Shader.h',
], 'libGLESv2/Texture.cpp',
'msvs_settings': { 'libGLESv2/Texture.h',
'VCLinkerTool': { 'libGLESv2/utilities.cpp',
'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'], 'libGLESv2/utilities.h',
'AdditionalDependencies': ['d3dx9.lib'], ],
} 'msvs_settings': {
}, 'VCLinkerTool': {
}, 'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
{ 'AdditionalDependencies': ['d3dx9.lib'],
'target_name': 'libEGL', }
'type': 'shared_library', },
'dependencies': ['libGLESv2'], },
'include_dirs': [ {
'.', 'target_name': 'libEGL',
'../include', 'type': 'shared_library',
], 'dependencies': ['libGLESv2'],
'sources': [ 'include_dirs': [
'common/angleutils.h', '.',
'common/debug.cpp', '../include',
'common/debug.h', ],
'libEGL/Config.cpp', 'sources': [
'libEGL/Config.h', 'common/angleutils.h',
'libEGL/Display.cpp', 'common/debug.cpp',
'libEGL/Display.h', 'common/debug.h',
'libEGL/libEGL.cpp', 'libEGL/Config.cpp',
'libEGL/libEGL.def', 'libEGL/Config.h',
'libEGL/main.cpp', 'libEGL/Display.cpp',
'libEGL/main.h', 'libEGL/Display.h',
'libEGL/Surface.cpp', 'libEGL/libEGL.cpp',
'libEGL/Surface.h', 'libEGL/libEGL.def',
'libEGL/main.cpp',
'libEGL/main.h',
'libEGL/Surface.cpp',
'libEGL/Surface.h',
],
'msvs_settings': {
'VCLinkerTool': {
'AdditionalDependencies': ['d3d9.lib'],
}
},
},
], ],
'msvs_settings': { }],
'VCLinkerTool': {
'AdditionalDependencies': ['d3d9.lib'],
}
},
},
], ],
} }
......
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