Skip to content

A
angle
Commit 8e8a1c68 by Jamie Madill
Options

dEQP: Move libtester sources to a gyp variable.

This keeps the target definition cleaner and will enable GN, if we ever get to that point. BUG=angleproject:998 Change-Id: I8692c93155a6bada9b1b0c05a1dd34af64a3b400 Reviewed-on: https://chromium-review.googlesource.com/280992Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org>
parent b3f4e8d1
Showing with 237 additions and 233 deletions
src/tests/deqp.gypi
...@@ -571,239 +571,7 @@ ...@@ -571,239 +571,7 @@
'<(deqp_dir)/modules/gles3/tes3TestPackage.hpp', '<(deqp_dir)/modules/gles3/tes3TestPackage.hpp',
'<(deqp_dir)/modules/gles3/tes3TestPackageEntry.cpp', '<(deqp_dir)/modules/gles3/tes3TestPackageEntry.cpp',
], ],
}, 'deqp_libtester_sources':
'conditions':
[
['angle_standalone==1',
{
'conditions':
[
['OS=="win"',
{
'targets':
[
{
'target_name': 'angle_zlib',
'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ],
'include_dirs':
[
'<(zlib_dir)',
],
'direct_dependent_settings':
{
'include_dirs':
[
'<(zlib_dir)',
],
},
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions':
[
'/wd4131', # old-style declarator
'/wd4244', # Conversion from 'type1' to 'type2', possible loss of data
'/wd4324', # structure was padded
'/wd4701', # potentially uninit used
'/wd4996', # deprecated
],
},
},
'sources':
[
'<(zlib_dir)/adler32.c',
'<(zlib_dir)/compress.c',
'<(zlib_dir)/crc32.c',
'<(zlib_dir)/crc32.h',
'<(zlib_dir)/deflate.c',
'<(zlib_dir)/deflate.h',
'<(zlib_dir)/gzclose.c',
'<(zlib_dir)/gzguts.h',
'<(zlib_dir)/gzlib.c',
'<(zlib_dir)/gzread.c',
'<(zlib_dir)/gzwrite.c',
'<(zlib_dir)/infback.c',
'<(zlib_dir)/inffast.c',
'<(zlib_dir)/inffast.h',
'<(zlib_dir)/inffixed.h',
'<(zlib_dir)/inflate.c',
'<(zlib_dir)/inflate.h',
'<(zlib_dir)/inftrees.c',
'<(zlib_dir)/inftrees.h',
'<(zlib_dir)/mozzconf.h',
'<(zlib_dir)/trees.c',
'<(zlib_dir)/trees.h',
'<(zlib_dir)/uncompr.c',
'<(zlib_dir)/x86.h',
'<(zlib_dir)/zconf.h',
'<(zlib_dir)/zlib.h',
'<(zlib_dir)/zutil.c',
'<(zlib_dir)/zutil.h',
'<(zlib_dir)/simd_stub.c',
],
},
{
'target_name': 'angle_libpng',
'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ],
'dependencies':
[
'angle_zlib'
],
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions':
[
'/wd4018', # signed/unsigned mismatch
'/wd4028', # parameter differs from decl
'/wd4101', # unreferenced local
'/wd4189', # unreferenced but initted
'/wd4244', # Conversion from 'type1' to 'type2', possible loss of data
],
},
},
'sources':
[
'<(libpng_dir)/png.c',
'<(libpng_dir)/pngerror.c',
'<(libpng_dir)/pngget.c',
'<(libpng_dir)/pngmem.c',
'<(libpng_dir)/pngpread.c',
'<(libpng_dir)/pngread.c',
'<(libpng_dir)/pngrio.c',
'<(libpng_dir)/pngrtran.c',
'<(libpng_dir)/pngrutil.c',
'<(libpng_dir)/pngset.c',
'<(libpng_dir)/pngtrans.c',
'<(libpng_dir)/pngwio.c',
'<(libpng_dir)/pngwrite.c',
'<(libpng_dir)/pngwtran.c',
'<(libpng_dir)/pngwutil.c',
],
},
{
'target_name': 'angle_deqp_decpp',
'type': 'static_library',
'msvs_disabled_warnings':
[
'<@(deqp_msvs_disabled_warnings)',
],
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions':
[
'/EHsc', # dEQP requires exceptions
],
},
},
'defines': ['<@(deqp_defines)'],
'include_dirs': ['<@(deqp_include_dirs)'],
'direct_dependent_settings':
{
'msvs_disabled_warnings':
[
'<@(deqp_msvs_disabled_warnings)',
],
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions':
[
'/EHsc', # dEQP requires exceptions
],
},
'VCLinkerTool':
{
'AdditionalDependencies':
[
'dbghelp.lib',
'gdi32.lib',
'user32.lib',
'ws2_32.lib',
],
},
},
'include_dirs': ['<@(deqp_include_dirs)'],
'defines': ['<@(deqp_defines)'],
},
'sources':
[
'<(deqp_dir)/framework/delibs/decpp/deArrayBuffer.cpp',
'<(deqp_dir)/framework/delibs/decpp/deBlockBuffer.cpp',
'<(deqp_dir)/framework/delibs/decpp/deCommandLine.cpp',
'<(deqp_dir)/framework/delibs/decpp/deDefs.cpp',
'<(deqp_dir)/framework/delibs/decpp/deDirectoryIterator.cpp',
'<(deqp_dir)/framework/delibs/decpp/deDynamicLibrary.cpp',
'<(deqp_dir)/framework/delibs/decpp/deFilePath.cpp',
'<(deqp_dir)/framework/delibs/decpp/deMemPool.cpp',
'<(deqp_dir)/framework/delibs/decpp/deMutex.cpp',
'<(deqp_dir)/framework/delibs/decpp/dePoolArray.cpp',
'<(deqp_dir)/framework/delibs/decpp/dePoolString.cpp',
'<(deqp_dir)/framework/delibs/decpp/deProcess.cpp',
'<(deqp_dir)/framework/delibs/decpp/deRandom.cpp',
'<(deqp_dir)/framework/delibs/decpp/deRingBuffer.cpp',
'<(deqp_dir)/framework/delibs/decpp/deSemaphore.cpp',
'<(deqp_dir)/framework/delibs/decpp/deSharedPtr.cpp',
'<(deqp_dir)/framework/delibs/decpp/deSocket.cpp',
'<(deqp_dir)/framework/delibs/decpp/deSTLUtil.cpp',
'<(deqp_dir)/framework/delibs/decpp/deStringUtil.cpp',
'<(deqp_dir)/framework/delibs/decpp/deThread.cpp',
'<(deqp_dir)/framework/delibs/decpp/deThreadLocal.cpp',
'<(deqp_dir)/framework/delibs/decpp/deThreadSafeRingBuffer.cpp',
'<(deqp_dir)/framework/delibs/decpp/deUniquePtr.cpp',
],
},
{
'target_name': 'angle_deqp_libtester',
'type': 'static_library',
'dependencies':
[
'angle_deqp_decpp',
'angle_libpng',
'<(angle_path)/src/angle.gyp:libEGL',
'<(angle_path)/util/util.gyp:angle_util',
],
'include_dirs':
[
'<(angle_path)/include',
],
'direct_dependent_settings':
{
'include_dirs':
[
'<(angle_path)/include',
],
'defines':
[
'ANGLE_DEQP_LIBTESTER_IMPLEMENTATION',
],
},
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions':
[
'/bigobj', # needed for glsBuiltinPrecisionTests.cpp
],
},
},
'export_dependent_settings':
[
'angle_deqp_decpp',
],
'sources':
[ [
'<(deqp_dir)/execserver/xsDefs.cpp', '<(deqp_dir)/execserver/xsDefs.cpp',
'<(deqp_dir)/execserver/xsExecutionServer.cpp', '<(deqp_dir)/execserver/xsExecutionServer.cpp',
...@@ -1050,6 +818,242 @@ ...@@ -1050,6 +818,242 @@
], ],
}, },
'conditions':
[
['angle_standalone==1',
{
'conditions':
[
['OS=="win"',
{
'targets':
[
{
'target_name': 'angle_zlib',
'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ],
'include_dirs':
[
'<(zlib_dir)',
],
'direct_dependent_settings':
{
'include_dirs':
[
'<(zlib_dir)',
],
},
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions':
[
'/wd4131', # old-style declarator
'/wd4244', # Conversion from 'type1' to 'type2', possible loss of data
'/wd4324', # structure was padded
'/wd4701', # potentially uninit used
'/wd4996', # deprecated
],
},
},
'sources':
[
'<(zlib_dir)/adler32.c',
'<(zlib_dir)/compress.c',
'<(zlib_dir)/crc32.c',
'<(zlib_dir)/crc32.h',
'<(zlib_dir)/deflate.c',
'<(zlib_dir)/deflate.h',
'<(zlib_dir)/gzclose.c',
'<(zlib_dir)/gzguts.h',
'<(zlib_dir)/gzlib.c',
'<(zlib_dir)/gzread.c',
'<(zlib_dir)/gzwrite.c',
'<(zlib_dir)/infback.c',
'<(zlib_dir)/inffast.c',
'<(zlib_dir)/inffast.h',
'<(zlib_dir)/inffixed.h',
'<(zlib_dir)/inflate.c',
'<(zlib_dir)/inflate.h',
'<(zlib_dir)/inftrees.c',
'<(zlib_dir)/inftrees.h',
'<(zlib_dir)/mozzconf.h',
'<(zlib_dir)/trees.c',
'<(zlib_dir)/trees.h',
'<(zlib_dir)/uncompr.c',
'<(zlib_dir)/x86.h',
'<(zlib_dir)/zconf.h',
'<(zlib_dir)/zlib.h',
'<(zlib_dir)/zutil.c',
'<(zlib_dir)/zutil.h',
'<(zlib_dir)/simd_stub.c',
],
},
{
'target_name': 'angle_libpng',
'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ],
'dependencies':
[
'angle_zlib'
],
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions':
[
'/wd4018', # signed/unsigned mismatch
'/wd4028', # parameter differs from decl
'/wd4101', # unreferenced local
'/wd4189', # unreferenced but initted
'/wd4244', # Conversion from 'type1' to 'type2', possible loss of data
],
},
},
'sources':
[
'<(libpng_dir)/png.c',
'<(libpng_dir)/pngerror.c',
'<(libpng_dir)/pngget.c',
'<(libpng_dir)/pngmem.c',
'<(libpng_dir)/pngpread.c',
'<(libpng_dir)/pngread.c',
'<(libpng_dir)/pngrio.c',
'<(libpng_dir)/pngrtran.c',
'<(libpng_dir)/pngrutil.c',
'<(libpng_dir)/pngset.c',
'<(libpng_dir)/pngtrans.c',
'<(libpng_dir)/pngwio.c',
'<(libpng_dir)/pngwrite.c',
'<(libpng_dir)/pngwtran.c',
'<(libpng_dir)/pngwutil.c',
],
},
{
'target_name': 'angle_deqp_decpp',
'type': 'static_library',
'msvs_disabled_warnings':
[
'<@(deqp_msvs_disabled_warnings)',
],
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions':
[
'/EHsc', # dEQP requires exceptions
],
},
},
'defines': ['<@(deqp_defines)'],
'include_dirs': ['<@(deqp_include_dirs)'],
'direct_dependent_settings':
{
'msvs_disabled_warnings':
[
'<@(deqp_msvs_disabled_warnings)',
],
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions':
[
'/EHsc', # dEQP requires exceptions
],
},
'VCLinkerTool':
{
'AdditionalDependencies':
[
'dbghelp.lib',
'gdi32.lib',
'user32.lib',
'ws2_32.lib',
],
},
},
'include_dirs': ['<@(deqp_include_dirs)'],
'defines': ['<@(deqp_defines)'],
},
'sources':
[
'<(deqp_dir)/framework/delibs/decpp/deArrayBuffer.cpp',
'<(deqp_dir)/framework/delibs/decpp/deBlockBuffer.cpp',
'<(deqp_dir)/framework/delibs/decpp/deCommandLine.cpp',
'<(deqp_dir)/framework/delibs/decpp/deDefs.cpp',
'<(deqp_dir)/framework/delibs/decpp/deDirectoryIterator.cpp',
'<(deqp_dir)/framework/delibs/decpp/deDynamicLibrary.cpp',
'<(deqp_dir)/framework/delibs/decpp/deFilePath.cpp',
'<(deqp_dir)/framework/delibs/decpp/deMemPool.cpp',
'<(deqp_dir)/framework/delibs/decpp/deMutex.cpp',
'<(deqp_dir)/framework/delibs/decpp/dePoolArray.cpp',
'<(deqp_dir)/framework/delibs/decpp/dePoolString.cpp',
'<(deqp_dir)/framework/delibs/decpp/deProcess.cpp',
'<(deqp_dir)/framework/delibs/decpp/deRandom.cpp',
'<(deqp_dir)/framework/delibs/decpp/deRingBuffer.cpp',
'<(deqp_dir)/framework/delibs/decpp/deSemaphore.cpp',
'<(deqp_dir)/framework/delibs/decpp/deSharedPtr.cpp',
'<(deqp_dir)/framework/delibs/decpp/deSocket.cpp',
'<(deqp_dir)/framework/delibs/decpp/deSTLUtil.cpp',
'<(deqp_dir)/framework/delibs/decpp/deStringUtil.cpp',
'<(deqp_dir)/framework/delibs/decpp/deThread.cpp',
'<(deqp_dir)/framework/delibs/decpp/deThreadLocal.cpp',
'<(deqp_dir)/framework/delibs/decpp/deThreadSafeRingBuffer.cpp',
'<(deqp_dir)/framework/delibs/decpp/deUniquePtr.cpp',
],
},
{
'target_name': 'angle_deqp_libtester',
'type': 'static_library',
'dependencies':
[
'angle_deqp_decpp',
'angle_libpng',
'<(angle_path)/src/angle.gyp:libEGL',
'<(angle_path)/util/util.gyp:angle_util',
],
'include_dirs':
[
'<(angle_path)/include',
],
'direct_dependent_settings':
{
'include_dirs':
[
'<(angle_path)/include',
],
'defines':
[
'ANGLE_DEQP_LIBTESTER_IMPLEMENTATION',
],
},
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions':
[
'/bigobj', # needed for glsBuiltinPrecisionTests.cpp
],
},
},
'export_dependent_settings':
[
'angle_deqp_decpp',
],
'sources':
[
'<@(deqp_libtester_sources)',
],
},
{ {
'target_name': 'angle_deqp_libgles2', 'target_name': 'angle_deqp_libgles2',
'type': 'shared_library', 'type': 'shared_library',
......
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