Skip to content

A
angle
Commit 403c9e59 by alokp@chromium.org
Options

Added libGLESv2, libEGL, and all samples to GYP.

Review URL: http://codereview.appspot.com/878042 git-svn-id: https://angleproject.googlecode.com/svn/trunk@100 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 27bf89bb
Showing with 311 additions and 74 deletions
build/common.gypi
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
{ {
'variables': { 'variables': {
'library%': 'static_library', 'library%': 'shared_library',
}, },
'target_defaults': { 'target_defaults': {
'default_configuration': 'Debug', 'default_configuration': 'Debug',
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
'VCCLCompilerTool': { 'VCCLCompilerTool': {
'BufferSecurityCheck': 'true', 'BufferSecurityCheck': 'true',
'DebugInformationFormat': '3', 'DebugInformationFormat': '3',
'ExceptionHandling': '0', # TODO(alokp): Disable exceptions before integrating with chromium.
#'ExceptionHandling': '0',
'EnableFunctionLevelLinking': 'true', 'EnableFunctionLevelLinking': 'true',
'MinimalRebuild': 'false', 'MinimalRebuild': 'false',
'PreprocessorDefinitions': [ 'PreprocessorDefinitions': [
......
samples/build_samples.gyp
...@@ -17,6 +17,136 @@ ...@@ -17,6 +17,136 @@
'translator/translator.cpp', 'translator/translator.cpp',
], ],
}, },
{
'target_name': 'essl_to_hlsl',
'type': 'executable',
'dependencies': [
'../src/build_angle.gyp:translator_hlsl',
],
'include_dirs': [
'../include',
],
'sources': [
'translator/translator.cpp',
],
},
{
'target_name': 'es_util',
'type': 'static_library',
'dependencies': [
'../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)',
'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',
],
},
], ],
} }
......
samples/gles2_book/Common/Win32/esUtil_win32.c
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
/// ///
// Includes // Includes
// //
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include "esUtil.h" #include "esUtil.h"
......
src/build_angle.gyp
...@@ -4,85 +4,76 @@ ...@@ -4,85 +4,76 @@
{ {
'variables': { 'variables': {
# Source files common between translator_glsl and translator_hlsl
'translator_common_sources': [
'common/angleutils.h',
'common/debug.cpp',
'common/debug.h',
'compiler/BaseTypes.h',
'compiler/Common.h',
'compiler/ConstantUnion.h',
'compiler/InfoSink.cpp',
'compiler/InfoSink.h',
'compiler/Initialize.cpp',
'compiler/Initialize.h',
'compiler/InitializeDll.cpp',
'compiler/InitializeDll.h',
'compiler/InitializeGlobals.h',
'compiler/InitializeParseContext.h',
'compiler/Intermediate.cpp',
'compiler/intermediate.h',
'compiler/intermOut.cpp',
'compiler/IntermTraverse.cpp',
'compiler/Link.cpp',
'compiler/localintermediate.h',
'compiler/MMap.h',
'compiler/osinclude.h',
'compiler/ossource.cpp',
'compiler/parseConst.cpp',
'compiler/ParseHelper.cpp',
'compiler/ParseHelper.h',
'compiler/PoolAlloc.cpp',
'compiler/PoolAlloc.h',
'compiler/QualifierAlive.cpp',
'compiler/QualifierAlive.h',
'compiler/RemoveTree.cpp',
'compiler/RemoveTree.h',
'compiler/ShaderLang.cpp',
'compiler/ShHandle.h',
'compiler/SymbolTable.cpp',
'compiler/SymbolTable.h',
'compiler/Types.h',
'compiler/unistd.h',
'compiler/preprocessor/atom.c',
'compiler/preprocessor/atom.h',
'compiler/preprocessor/compile.h',
'compiler/preprocessor/cpp.c',
'compiler/preprocessor/cpp.h',
'compiler/preprocessor/cppstruct.c',
'compiler/preprocessor/memory.c',
'compiler/preprocessor/memory.h',
'compiler/preprocessor/parser.h',
'compiler/preprocessor/preprocess.h',
'compiler/preprocessor/scanner.c',
'compiler/preprocessor/scanner.h',
'compiler/preprocessor/slglobals.h',
'compiler/preprocessor/symbols.c',
'compiler/preprocessor/symbols.h',
'compiler/preprocessor/tokens.c',
'compiler/preprocessor/tokens.h',
# Generated files
'compiler/Gen_glslang.cpp',
'compiler/Gen_glslang_tab.cpp',
'compiler/glslang_tab.h',
],
}, },
'targets': [ 'targets': [
{ {
'target_name': 'translator_glsl', 'target_name': 'translator_common',
'type': '<(library)', 'type': 'static_library',
'include_dirs': [ 'include_dirs': [
'compiler', 'compiler',
'.', '.',
'../include', '../include',
], ],
'sources': [ 'sources': [
'<@(translator_common_sources)', 'common/angleutils.h',
'compiler/CodeGenGLSL.cpp', 'common/debug.cpp',
'compiler/OutputGLSL.cpp', 'common/debug.h',
'compiler/OutputGLSL.h', 'compiler/BaseTypes.h',
'compiler/TranslatorGLSL.cpp', 'compiler/Common.h',
'compiler/TranslatorGLSL.h', 'compiler/ConstantUnion.h',
'compiler/InfoSink.cpp',
'compiler/InfoSink.h',
'compiler/Initialize.cpp',
'compiler/Initialize.h',
'compiler/InitializeDll.cpp',
'compiler/InitializeDll.h',
'compiler/InitializeGlobals.h',
'compiler/InitializeParseContext.h',
'compiler/Intermediate.cpp',
'compiler/intermediate.h',
'compiler/intermOut.cpp',
'compiler/IntermTraverse.cpp',
'compiler/Link.cpp',
'compiler/localintermediate.h',
'compiler/MMap.h',
'compiler/osinclude.h',
'compiler/ossource.cpp',
'compiler/parseConst.cpp',
'compiler/ParseHelper.cpp',
'compiler/ParseHelper.h',
'compiler/PoolAlloc.cpp',
'compiler/PoolAlloc.h',
'compiler/QualifierAlive.cpp',
'compiler/QualifierAlive.h',
'compiler/RemoveTree.cpp',
'compiler/RemoveTree.h',
'compiler/ShaderLang.cpp',
'compiler/ShHandle.h',
'compiler/SymbolTable.cpp',
'compiler/SymbolTable.h',
'compiler/Types.h',
'compiler/unistd.h',
'compiler/preprocessor/atom.c',
'compiler/preprocessor/atom.h',
'compiler/preprocessor/compile.h',
'compiler/preprocessor/cpp.c',
'compiler/preprocessor/cpp.h',
'compiler/preprocessor/cppstruct.c',
'compiler/preprocessor/memory.c',
'compiler/preprocessor/memory.h',
'compiler/preprocessor/parser.h',
'compiler/preprocessor/preprocess.h',
'compiler/preprocessor/scanner.c',
'compiler/preprocessor/scanner.h',
'compiler/preprocessor/slglobals.h',
'compiler/preprocessor/symbols.c',
'compiler/preprocessor/symbols.h',
'compiler/preprocessor/tokens.c',
'compiler/preprocessor/tokens.h',
# Generated files
'compiler/Gen_glslang.cpp',
'compiler/Gen_glslang_tab.cpp',
'compiler/glslang_tab.h',
], ],
'actions': [ 'actions': [
{ {
...@@ -111,6 +102,120 @@ ...@@ -111,6 +102,120 @@
}, },
], ],
}, },
{
'target_name': 'translator_glsl',
'type': 'static_library',
'dependencies': ['translator_common'],
'include_dirs': [
'compiler',
'.',
'../include',
],
'sources': [
'compiler/CodeGenGLSL.cpp',
'compiler/OutputGLSL.cpp',
'compiler/OutputGLSL.h',
'compiler/TranslatorGLSL.cpp',
'compiler/TranslatorGLSL.h',
],
},
{
'target_name': 'translator_hlsl',
'type': 'static_library',
'dependencies': ['translator_common'],
'include_dirs': [
'compiler',
'.',
'../include',
],
'sources': [
'compiler/CodeGenHLSL.cpp',
'compiler/OutputHLSL.cpp',
'compiler/OutputHLSL.h',
'compiler/TranslatorHLSL.cpp',
'compiler/TranslatorHLSL.h',
],
},
{
'target_name': 'libGLESv2',
'type': '<(library)',
'dependencies': ['translator_hlsl'],
'include_dirs': [
'libGLESv2',
'.',
'../include',
],
'sources': [
'common/angleutils.h',
'common/debug.cpp',
'common/debug.h',
'libGLESv2/geometry/backend.cpp',
'libGLESv2/geometry/backend.h',
'libGLESv2/geometry/dx9.cpp',
'libGLESv2/geometry/dx9.h',
'libGLESv2/geometry/IndexDataManager.cpp',
'libGLESv2/geometry/IndexDataManager.h',
'libGLESv2/geometry/vertexconversion.h',
'libGLESv2/geometry/VertexDataManager.cpp',
'libGLESv2/geometry/VertexDataManager.h',
'libGLESv2/Buffer.cpp',
'libGLESv2/Buffer.h',
'libGLESv2/Context.cpp',
'libGLESv2/Context.h',
'libGLESv2/Framebuffer.cpp',
'libGLESv2/Framebuffer.h',
'libGLESv2/libGLESv2.cpp',
'libGLESv2/libGLESv2.def',
'libGLESv2/main.cpp',
'libGLESv2/main.h',
'libGLESv2/mathutil.h',
'libGLESv2/Program.cpp',
'libGLESv2/Program.h',
'libGLESv2/Renderbuffer.cpp',
'libGLESv2/Renderbuffer.h',
'libGLESv2/Shader.cpp',
'libGLESv2/Shader.h',
'libGLESv2/Texture.cpp',
'libGLESv2/Texture.h',
'libGLESv2/utilities.cpp',
'libGLESv2/utilities.h',
],
'msvs_settings': {
'VCLinkerTool': {
'AdditionalDependencies': ['d3dx9.lib'],
}
},
},
{
'target_name': 'libEGL',
'type': '<(library)',
'dependencies': ['libGLESv2'],
'include_dirs': [
'libEGL',
'.',
'../include',
],
'sources': [
'common/angleutils.h',
'common/debug.cpp',
'common/debug.h',
'libEGL/Config.cpp',
'libEGL/Config.h',
'libEGL/Display.cpp',
'libEGL/Display.h',
'libEGL/libEGL.cpp',
'libEGL/libEGL.def',
'libEGL/main.cpp',
'libEGL/main.h',
'libEGL/Surface.cpp',
'libEGL/Surface.h',
],
'msvs_settings': {
'VCLinkerTool': {
'AdditionalDependencies': ['d3d9.lib'],
}
},
},
], ],
} }
...@@ -118,4 +223,4 @@ ...@@ -118,4 +223,4 @@
# tab-width:2 # tab-width:2
# indent-tabs-mode:nil # indent-tabs-mode:nil
# End: # End:
# vim: set expandtab tabstop=2 shiftwidth=2: # vim: set expandtab tabstop=2 shiftwidth=2:
\ No newline at end of file
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