Skip to content

A
angle
Commit 3cd50f7e by Geoff Lang
Options

Fix remaining discrepencies between master and es3proto project files.

Change-Id: I335c9346ac268beab25184e2b18ccfdd0b15c7b1 Reviewed-on: https://chromium-review.googlesource.com/182150Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 91382e55
Showing with 368 additions and 330 deletions
build/all.gyp
...@@ -3,31 +3,23 @@ ...@@ -3,31 +3,23 @@
# found in the LICENSE file. # found in the LICENSE file.
{ {
'targets': [ 'targets':
{ [
'target_name': 'All', {
'type': 'none', 'target_name': 'All',
'dependencies': [ 'type': 'none',
'../src/angle.gyp:*', 'dependencies': [ '../src/angle.gyp:*', ],
], 'conditions':
'conditions': [ [
['angle_build_samples==1', { ['angle_build_samples==1',
'dependencies': [ {
'../samples/samples.gyp:*', 'dependencies': [ '../samples/samples.gyp:*', ],
], }],
}], ['angle_build_tests==1',
['angle_build_tests==1', { {
'dependencies': [ 'dependencies': [ '../tests/tests.gyp:*', ],
'../tests/tests.gyp:*', }],
], ],
}], },
], ],
},
],
} }
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
build/common.gypi
...@@ -3,255 +3,313 @@ ...@@ -3,255 +3,313 @@
# found in the LICENSE file. # found in the LICENSE file.
{ {
'variables': { 'variables':
'component%': 'static_library', {
'angle_build_tests%': '1', 'component%': 'static_library',
'angle_build_samples%': '1', 'angle_build_tests%': '1',
# angle_code is set to 1 for the core ANGLE targets defined in src/build_angle.gyp. 'angle_build_samples%': '1',
# angle_code is set to 0 for test code, sample code, and third party code. # angle_code is set to 1 for the core ANGLE targets defined in src/build_angle.gyp.
# When angle_code is 1, we build with additional warning flags on Mac and Linux. # angle_code is set to 0 for test code, sample code, and third party code.
'angle_code%': 0, # When angle_code is 1, we build with additional warning flags on Mac and Linux.
'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0', 'angle_code%': 0,
'gcc_or_clang_warnings': [ 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
'-Wall', 'gcc_or_clang_warnings':
'-Wchar-subscripts', [
'-Werror', '-Wall',
'-Wextra', '-Wchar-subscripts',
'-Wformat=2', '-Werror',
'-Winit-self', '-Wextra',
'-Wno-sign-compare', '-Wformat=2',
'-Wno-unused-function', '-Winit-self',
'-Wno-unused-parameter', '-Wno-sign-compare',
'-Wno-unknown-pragmas', '-Wno-unused-function',
'-Wpacked', '-Wno-unused-parameter',
'-Wpointer-arith', '-Wno-unknown-pragmas',
'-Wundef', '-Wpacked',
'-Wwrite-strings', '-Wpointer-arith',
], '-Wundef',
}, '-Wwrite-strings',
'target_defaults': { ],
'default_configuration': 'Debug',
'variables': {
'warn_as_error%': 1,
}, },
'target_conditions': [ 'target_defaults':
['warn_as_error == 1', { {
'msvs_settings': { 'default_configuration': 'Debug',
'VCCLCompilerTool': { 'variables':
'WarnAsError': 'true', {
}, 'warn_as_error%': 1,
},
}],
],
'configurations': {
'Common_Base': {
'abstract': 1,
'msvs_configuration_attributes': {
'OutputDirectory': '$(SolutionDir)$(ConfigurationName)_$(Platform)',
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
'CharacterSet': '1', # UNICODE
}, },
'msvs_settings': { 'target_conditions':
'VCCLCompilerTool': { [
'AdditionalOptions': ['/MP'], ['warn_as_error == 1',
'BufferSecurityCheck': 'true', {
'DebugInformationFormat': '3', 'msvs_settings':
# TODO(alokp): Disable exceptions before integrating with chromium. {
#'ExceptionHandling': '0', 'VCCLCompilerTool':
'EnableFunctionLevelLinking': 'true', {
'MinimalRebuild': 'false', 'WarnAsError': 'true',
'PreprocessorDefinitions': [ },
'_CRT_SECURE_NO_DEPRECATE', },
'_SCL_SECURE_NO_WARNINGS', }],
'_HAS_EXCEPTIONS=0',
'_WIN32_WINNT=0x0600',
'_WINDOWS',
'NOMINMAX',
'WIN32',
'WIN32_LEAN_AND_MEAN',
'WINVER=0x0600',
],
'RuntimeTypeInfo': 'false',
'WarningLevel': '4',
},
'VCLinkerTool': {
'FixedBaseAddress': '1',
'GenerateDebugInformation': 'true',
'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
'MapFileName': '$(OutDir)\\$(TargetName).map',
# Most of the executables we'll ever create are tests
# and utilities with console output.
'SubSystem': '1', # /SUBSYSTEM:CONSOLE
'AdditionalDependencies': [
'kernel32.lib',
'gdi32.lib',
'winspool.lib',
'comdlg32.lib',
'advapi32.lib',
'shell32.lib',
'ole32.lib',
'oleaut32.lib',
'user32.lib',
'uuid.lib',
'odbc32.lib',
'odbccp32.lib',
'delayimp.lib',
],
},
'VCResourceCompilerTool': {
'Culture': '1033',
},
},
'msvs_disabled_warnings': [4100, 4127, 4189, 4239, 4244, 4245, 4512, 4702, 4530, 4718],
'msvs_system_include_dirs': [
'<(windows_sdk_path)/Include/shared',
'<(windows_sdk_path)/Include/um',
], ],
}, # Common_Base 'configurations':
{
'Common_Base':
{
'abstract': 1,
'msvs_configuration_attributes':
{
'OutputDirectory': '$(SolutionDir)$(ConfigurationName)_$(Platform)',
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
'CharacterSet': '1', # UNICODE
},
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions': ['/MP'],
'BufferSecurityCheck': 'true',
'DebugInformationFormat': '3',
# TODO(alokp): Disable exceptions before integrating with chromium.
#'ExceptionHandling': '0',
'EnableFunctionLevelLinking': 'true',
'MinimalRebuild': 'false',
'PreprocessorDefinitions':
[
'_CRT_SECURE_NO_DEPRECATE',
'_SCL_SECURE_NO_WARNINGS',
'_HAS_EXCEPTIONS=0',
'_WIN32_WINNT=0x0600',
'_WINDOWS',
'NOMINMAX',
'WIN32',
'WIN32_LEAN_AND_MEAN',
'WINVER=0x0600',
],
'RuntimeTypeInfo': 'false',
'WarningLevel': '4',
},
'VCLinkerTool':
{
'FixedBaseAddress': '1',
'GenerateDebugInformation': 'true',
'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
'MapFileName': '$(OutDir)\\$(TargetName).map',
# Most of the executables we'll ever create are tests
# and utilities with console output.
'SubSystem': '1', # /SUBSYSTEM:CONSOLE
'AdditionalDependencies':
[
'kernel32.lib',
'gdi32.lib',
'winspool.lib',
'comdlg32.lib',
'advapi32.lib',
'shell32.lib',
'ole32.lib',
'oleaut32.lib',
'user32.lib',
'uuid.lib',
'odbc32.lib',
'odbccp32.lib',
'delayimp.lib',
],
},
'VCResourceCompilerTool':
{
'Culture': '1033',
},
},
'msvs_disabled_warnings': [ 4100, 4127, 4189, 4239, 4244, 4245, 4512, 4702, 4530, 4718 ],
'msvs_system_include_dirs':
[
'<(windows_sdk_path)/Include/shared',
'<(windows_sdk_path)/Include/um',
],
}, # Common_Base
'Debug_Base': { 'Debug_Base':
'abstract': 1, {
'msvs_settings': { 'abstract': 1,
'VCCLCompilerTool': { 'msvs_settings':
'Optimization': '0', # /Od {
'PreprocessorDefinitions': ['_DEBUG'], 'VCCLCompilerTool':
'BasicRuntimeChecks': '3', {
'RuntimeLibrary': '1', # /MTd (debug static) 'Optimization': '0', # /Od
}, 'PreprocessorDefinitions': [ '_DEBUG' ],
'VCLinkerTool': { 'BasicRuntimeChecks': '3',
'LinkIncremental': '2', 'RuntimeLibrary': '1', # /MTd (debug static)
}, },
}, 'VCLinkerTool':
'xcode_settings': { {
'COPY_PHASE_STRIP': 'NO', 'LinkIncremental': '2',
'GCC_OPTIMIZATION_LEVEL': '0', },
}, },
}, # Debug_Base 'xcode_settings':
{
'COPY_PHASE_STRIP': 'NO',
'GCC_OPTIMIZATION_LEVEL': '0',
},
}, # Debug_Base
'Release_Base': { 'Release_Base':
'abstract': 1, {
'msvs_settings': { 'abstract': 1,
'VCCLCompilerTool': { 'msvs_settings':
'Optimization': '2', # /Os {
'PreprocessorDefinitions': ['NDEBUG'], 'VCCLCompilerTool':
'RuntimeLibrary': '0', # /MT (static) {
}, 'Optimization': '2', # /Os
'VCLinkerTool': { 'PreprocessorDefinitions': ['NDEBUG'],
'LinkIncremental': '1', 'RuntimeLibrary': '0', # /MT (static)
}, },
}, 'VCLinkerTool':
}, # Release_Base {
'LinkIncremental': '1',
},
},
}, # Release_Base
'x86_Base': { 'x86_Base':
'abstract': 1, {
'msvs_configuration_platform': 'Win32', 'abstract': 1,
'msvs_settings': { 'msvs_configuration_platform': 'Win32',
'VCLinkerTool': { 'msvs_settings':
'TargetMachine': '1', {
'AdditionalLibraryDirectories': [ 'VCLinkerTool':
'<(windows_sdk_path)/Lib/win8/um/x86', {
], 'TargetMachine': '1',
}, 'AdditionalLibraryDirectories':
'VCLibrarianTool': { [
'AdditionalLibraryDirectories': [ '<(windows_sdk_path)/Lib/win8/um/x86',
'<(windows_sdk_path)/Lib/win8/um/x86', ],
], },
}, 'VCLibrarianTool':
}, {
}, # x86_Base 'AdditionalLibraryDirectories':
[
'<(windows_sdk_path)/Lib/win8/um/x86',
],
},
},
}, # x86_Base
'x64_Base': { 'x64_Base':
'abstract': 1, {
'msvs_configuration_platform': 'x64', 'abstract': 1,
'msvs_settings': { 'msvs_configuration_platform': 'x64',
'VCLinkerTool': { 'msvs_settings':
'TargetMachine': '17', # x86 - 64 {
'AdditionalLibraryDirectories': [ 'VCLinkerTool':
'<(windows_sdk_path)/Lib/win8/um/x64', {
], 'TargetMachine': '17', # x86 - 64
}, 'AdditionalLibraryDirectories':
'VCLibrarianTool': { [
'AdditionalLibraryDirectories': [ '<(windows_sdk_path)/Lib/win8/um/x64',
'<(windows_sdk_path)/Lib/win8/um/x64', ],
], },
}, 'VCLibrarianTool': {
}, 'AdditionalLibraryDirectories':
}, # x64_Base [
'<(windows_sdk_path)/Lib/win8/um/x64',
],
},
},
}, # x64_Base
# Concrete configurations # Concrete configurations
'Debug': { 'Debug':
'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'], {
}, 'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'],
'Release': {
'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'],
},
'conditions': [
[ 'OS=="win" and MSVS_VERSION != "2010e" and MSVS_VERSION != "2012e"', {
'Debug_x64': {
'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
},
'Release_x64': {
'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
},
}],
],
}, # configurations
'conditions': [
['component=="shared_library"', {
'defines': ['COMPONENT_BUILD'],
}],
],
}, # target_defaults
'conditions': [
['OS=="win"', {
'target_defaults': {
'msvs_cygwin_dirs': ['../third_party/cygwin'],
},
}],
['OS!="win" and OS!="mac"', {
'target_defaults': {
'cflags': [
'-pthread',
'-fno-exceptions',
],
'ldflags': [
'-pthread',
],
'configurations': {
'Debug': {
'variables': {
'debug_optimize%': '0',
}, },
'defines': [ 'Release':
'_DEBUG', {
], 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'],
'cflags': [ },
'-O>(debug_optimize)', 'conditions':
'-g', [
[ 'OS == "win" and MSVS_VERSION != "2010e" and MSVS_VERSION != "2012e"',
{
'Debug_x64':
{
'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
},
'Release_x64':
{
'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
},
}],
], ],
} }, # configurations
}, 'conditions':
}, [
}], ['component=="shared_library"',
['angle_code==1', { {
'target_defaults': { 'defines': [ 'COMPONENT_BUILD' ],
'conditions': [ }],
['OS=="mac"', { ],
'xcode_settings': { }, # target_defaults
'WARNING_CFLAGS': ['<@(gcc_or_clang_warnings)'] 'conditions':
[
['OS == "win"',
{
'target_defaults':
{
'msvs_cygwin_dirs': ['../third_party/cygwin'],
},
}],
['OS != "win" and OS != "mac"',
{
'target_defaults':
{
'cflags':
[
'-pthread',
'-fno-exceptions',
],
'ldflags':
[
'-pthread',
],
'configurations':
{
'Debug':
{
'variables':
{
'debug_optimize%': '0',
},
'defines':
[
'_DEBUG',
],
'cflags':
[
'-O>(debug_optimize)',
'-g',
],
}
},
}, },
}], }],
['OS!="win" and OS!="mac"', { ['angle_code==1',
'cflags': ['<@(gcc_or_clang_warnings)'] {
}], 'target_defaults':
] {
} 'conditions':
}], [
], ['OS == "mac"',
{
'xcode_settings':
{
'WARNING_CFLAGS': ['<@(gcc_or_clang_warnings)']
},
}],
['OS != "win" and OS != "mac"',
{
'cflags': ['<@(gcc_or_clang_warnings)']
}],
]
}
}],
],
} }
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
build/gyp_angle
...@@ -14,22 +14,21 @@ script_dir = os.path.dirname(__file__) ...@@ -14,22 +14,21 @@ script_dir = os.path.dirname(__file__)
angle_dir = os.path.normpath(os.path.join(script_dir, os.pardir)) angle_dir = os.path.normpath(os.path.join(script_dir, os.pardir))
sys.path.append(os.path.join(angle_dir, 'third_party', 'gyp', 'pylib')) sys.path.append(os.path.join(angle_dir, 'third_party', 'gyp', 'pylib'))
print os.path.join(angle_dir, 'third_party', 'gyp', 'pylib')
import gyp import gyp
if __name__ == '__main__': if __name__ == '__main__':
args = sys.argv[1:] args = sys.argv[1:]
print 'Updating projects from gyp files...' print 'Updating projects from gyp files...'
sys.stdout.flush() sys.stdout.flush()
# Set the depth to get the top-level Makefile generated into the # Set the depth to get the top-level Makefile generated into the
# correct directory. This only has an effect on Linux. # correct directory. This only has an effect on Linux.
args.append('--depth'); args.append('--depth');
args.append('.'); args.append('.');
# Add common.gypi to the include path. # Add common.gypi to the include path.
args.append('-I' + os.path.join(script_dir, 'common.gypi')) args.append('-I' + os.path.join(script_dir, 'common.gypi'))
args.append('--no-parallel') args.append('--no-parallel')
# Add all.gyp as the main gyp file to be generated. # Add all.gyp as the main gyp file to be generated.
args.append(os.path.join(script_dir, 'all.gyp')) args.append(os.path.join(script_dir, 'all.gyp'))
sys.exit(gyp.main(args)) sys.exit(gyp.main(args))
generate_projects
...@@ -23,25 +23,25 @@ build_samples = True ...@@ -23,25 +23,25 @@ build_samples = True
build_tests = False build_tests = False
if __name__ == '__main__': if __name__ == '__main__':
gyp_cmd = os.path.join(gyp_dir, 'gyp') gyp_cmd = os.path.join(gyp_dir, 'gyp')
gyp_cmd += ' --ignore-environment' gyp_cmd += ' --ignore-environment'
gyp_cmd += ' --depth=.' gyp_cmd += ' --depth=.'
gyp_cmd += ' --include=' + os.path.join(script_dir, 'common.gypi') gyp_cmd += ' --include=' + os.path.join(script_dir, 'common.gypi')
gyp_cmd += ' --generator-output=' + generation_dir gyp_cmd += ' --generator-output=' + generation_dir
gyp_cmd += ' --format=' + gyp_generators gyp_cmd += ' --format=' + gyp_generators
gyp_cmd += ' -G msvs_version=' + msvs_version gyp_cmd += ' -G msvs_version=' + msvs_version
gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0') gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0')
gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0') gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0')
gyp_cmd += ' -D angle_relative_src_path=..\\..\\src\\' gyp_cmd += ' -D angle_relative_src_path=..\\..\\src\\'
gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp') gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp')
print 'Generating projects to' + generation_dir + ' from gyp files...' print 'Generating projects to ' + generation_dir + ' from gyp files...'
print gyp_cmd print gyp_cmd
sys.stdout.flush() sys.stdout.flush()
os.system(gyp_cmd) os.system(gyp_cmd)
git_add_cmd = 'git add ' + generation_dir + ' -u' git_add_cmd = 'git add ' + generation_dir + ' -u'
print '\nRunning git add on updated Visual Studio projects...' print '\nRunning git add on updated Visual Studio projects...'
print git_add_cmd print git_add_cmd
sys.stdout.flush() sys.stdout.flush()
os.system(git_add_cmd) os.system(git_add_cmd)
projects/src/translator.vcxproj.filters
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.h"> <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.h">
<Filter>..\..\src\compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\compiler\translator\ValidateLimitations.cpp"> <ClCompile Include="..\..\src\compiler\translator\ValidateLimitations.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.cpp"> <ClCompile Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.cpp">
<Filter>..\..\src\compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\compiler\translator\MMap.h"> <ClInclude Include="..\..\src\compiler\translator\MMap.h">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
......
projects/src/translator_static.vcxproj.filters
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.h"> <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.h">
<Filter>..\..\src\compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\compiler\translator\ValidateLimitations.cpp"> <ClCompile Include="..\..\src\compiler\translator\ValidateLimitations.cpp">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.cpp"> <ClCompile Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.cpp">
<Filter>..\..\src\compiler\translator</Filter> <Filter>compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\compiler\translator\MMap.h"> <ClInclude Include="..\..\src\compiler\translator\MMap.h">
<Filter>compiler\translator</Filter> <Filter>compiler\translator</Filter>
......
src/angle.gyp
...@@ -8,9 +8,3 @@ ...@@ -8,9 +8,3 @@
'angle.gypi', 'angle.gypi',
], ],
} }
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
src/angle.gypi
...@@ -88,12 +88,3 @@ ...@@ -88,12 +88,3 @@
] ]
] # conditions ] # conditions
} }
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
# Copyright (c) 2012 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.
src/build_angle.gyp
...@@ -8,9 +8,3 @@ ...@@ -8,9 +8,3 @@
'angle.gypi', 'angle.gypi',
], ],
} }
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
tests/build_tests.gyp 0 → 100644
# Copyright (c) 2012 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.
{
'includes':
[
'build_tests.gypi',
],
}
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